diff imgconvert.c @ 12320:035ca6548e29 libavcodec

Use av_fill_image_pointers/linesizes in place of ff_fill_pointer/linesize, and drop the the ff_ variants at the next major bump.
author stefano
date Sat, 31 Jul 2010 16:46:20 +0000
parents 0046ee0d227c
children 914f484bb476
line wrap: on
line diff
--- a/imgconvert.c	Sat Jul 31 16:37:23 2010 +0000
+++ b/imgconvert.c	Sat Jul 31 16:46:20 2010 +0000
@@ -498,6 +498,7 @@
     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 @@
 {
     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)