Mercurial > libavcodec.hg
changeset 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 | 014e19fbfae7 |
| children | b2940a8f3db6 |
| files | imgconvert.c imgconvert.h utils.c |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
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)
--- a/imgconvert.h Sat Jul 31 16:37:23 2010 +0000 +++ b/imgconvert.h Sat Jul 31 16:46:20 2010 +0000 @@ -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);
--- a/utils.c Sat Jul 31 16:37:23 2010 +0000 +++ b/utils.c Sat Jul 31 16:46:20 2010 +0000 @@ -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 @@ 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 @@ } } 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;