diff options
author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-07-31 20:46:20 +0400 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-07-31 20:46:20 +0400 |
commit | 05236ed7359b8310eb614adcdda025e5ea1a2ed5 (patch) | |
tree | 57693bbfd0ad9eead67681dfe17886d9467eff1b /libavcodec/utils.c | |
parent | 93d65e3d92623500b69fe7ccba43f6b6266c3250 (diff) |
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/utils.c')
-rw-r--r-- | libavcodec/utils.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index e01b516751..1d12f69db4 100644 --- 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; |