[FFmpeg-devel] [PATCH 2/3] Deprecate ff_get_plane_bytewidth() in favor of av_get_image_linesize().

[Stefano Sabatini]

---
 libavcodec/imgconvert.c |    4 +++-
 libavcodec/imgconvert.h |    3 ++-
 libavfilter/avfilter.c  |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 65b40fd..33bc354 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -794,10 +794,12 @@ void ff_img_copy_plane(uint8_t *dst, int dst_wrap,
     }
 }
 
+#if LIBAVCODEC_VERSION_MAJOR < 53
 int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane)
 {
     return av_get_image_linesize(pix_fmt, width, plane);
 }
+#endif
 
 void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4],
                           uint8_t *src_data[4], int src_linesize[4],
@@ -812,7 +814,7 @@ void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4],
     case FF_PIXEL_PLANAR:
         for(i = 0; i < pf->nb_channels; i++) {
             int h;
-            int bwidth = ff_get_plane_bytewidth(pix_fmt, width, i);
+            int bwidth = av_get_image_linesize(pix_fmt, width, i);
             h = height;
             if (i == 1 || i == 2) {
                 h= -((-height)>>desc->log2_chroma_h);
diff --git a/libavcodec/imgconvert.h b/libavcodec/imgconvert.h
index f09fcbf..0f2c2e1 100644
--- a/libavcodec/imgconvert.h
+++ b/libavcodec/imgconvert.h
@@ -33,9 +33,10 @@ int ff_fill_linesize(AVPicture *picture, enum PixelFormat pix_fmt, int width);
 
 attribute_deprecated
 int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt, int height);
-#endif
 
+attribute_deprecated
 int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane);
+#endif
 
 int ff_set_systematic_pal(uint32_t pal[256], enum PixelFormat pix_fmt);
 
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index d6fc895..a6bc248 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -322,7 +322,7 @@ void avfilter_draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
 
         for(i = 0; i < 4; i ++) {
             int planew =
-                ff_get_plane_bytewidth(link->format, link->cur_buf->video->w, i);
+                av_get_image_linesize(link->format, link->cur_buf->video->w, i);
 
             if(!src[i]) continue;
 
-- 
1.7.0.4