diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-07-31 16:46:20 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-07-31 16:46:20 +0000 |
| commit | 05236ed7359b8310eb614adcdda025e5ea1a2ed5 (patch) | |
| tree | 57693bbfd0ad9eead67681dfe17886d9467eff1b /libavcodec/imgconvert.c | |
| parent | 93d65e3d92623500b69fe7ccba43f6b6266c3250 (diff) | |
| download | ffmpeg-05236ed7359b8310eb614adcdda025e5ea1a2ed5.tar.gz | |
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
Diffstat (limited to 'libavcodec/imgconvert.c')
| -rw-r--r-- | libavcodec/imgconvert.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 2159216890..95c5df84e8 100644 --- 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) |