Use av_fill_image_pointers/linesizes in place of ff_fill_pointer/linesize,

and drop the the ff_ variants at the next major bump.

Originally committed as revision 24620 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 2159216890f305f44d46a53ef997911d58ca2e08..95c5df84e8029c5ba60c5af6c203619089c80411 100644 (file)
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -498,6 +498,7 @@ int ff_set_systematic_pal(uint32_t pal[256], enum PixelFormat pix_fmt){
     return 0;
 }
 
+#if LIBAVCODEC_VERSION_MAJOR < 53
 int ff_fill_linesize(AVPicture *picture, enum PixelFormat pix_fmt, int width)
 {
     return av_fill_image_linesizes(picture->linesize, pix_fmt, width);
@@ -508,6 +509,7 @@ int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt,
 {
     return av_fill_image_pointers(picture->data, pix_fmt, height, ptr, picture->linesize);
 }
+#endif
 
 int avpicture_fill(AVPicture *picture, uint8_t *ptr,
                    enum PixelFormat pix_fmt, int width, int height)

diff --git a/libavcodec/imgconvert.h b/libavcodec/imgconvert.h
index 48e2f127195411d36fee6539b4e12f313260d375..f09fcbfc0e50be1b45dcd5e467211ef3db061a13 100644 (file)
--- a/libavcodec/imgconvert.h
+++ b/libavcodec/imgconvert.h
@@ -27,9 +27,13 @@
 #include <stdint.h>
 #include "avcodec.h"
 
+#if LIBAVCODEC_VERSION_MAJOR < 53
+attribute_deprecated
 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
 
 int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane);
 

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index e01b51675130cec6483842f4aa4b62542d65a7f4..1d12f69db46c7a0d82f95fbbb726cefa20dd66dc 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -29,6 +29,7 @@
 #include "libavutil/integer.h"
 #include "libavutil/crc.h"
 #include "libavutil/pixdesc.h"
+#include "libavcore/imgutils.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "opt.h"
@@ -284,7 +285,7 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){
         do {
             // NOTE: do not align linesizes individually, this breaks e.g. assumptions
             // that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2
-            ff_fill_linesize(&picture, s->pix_fmt, w);
+            av_fill_image_linesizes(picture.linesize, s->pix_fmt, w);
             // increase alignment of w for next try (rhs gives the lowest bit set in w)
             w += w & ~(w-1);
 
@@ -294,7 +295,7 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){
             }
         } while (unaligned);
 
-        tmpsize = ff_fill_pointer(&picture, NULL, s->pix_fmt, h);
+        tmpsize = av_fill_image_pointers(picture.data, s->pix_fmt, h, NULL, picture.linesize);
         if (tmpsize < 0)
             return -1;