diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-07 21:24:03 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-07 21:24:03 +0000 |
| commit | 9d2e0ad824becfca3768b2d26674f43cc70948d8 (patch) | |
| tree | d8bd049459a95bcf256c89b3e9dc81da4a41ca43 | |
| parent | 4afbcf46c91ebba9bb06d8e8a33a4201c5131bce (diff) | |
| download | ffmpeg-9d2e0ad824becfca3768b2d26674f43cc70948d8.tar.gz | |
Remove use of deprecated functions av_image_fill_pointers/linesizes in
libavcodec/utils.c, fix warnings.
Originally committed as revision 25069 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index b31f7ef45e..067c213ada 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -283,7 +283,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 - av_fill_image_linesizes(picture.linesize, s->pix_fmt, w); + av_image_fill_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); @@ -293,7 +293,7 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){ } } while (unaligned); - tmpsize = av_fill_image_pointers(picture.data, s->pix_fmt, h, NULL, picture.linesize); + tmpsize = av_image_fill_pointers(picture.data, s->pix_fmt, h, NULL, picture.linesize); if (tmpsize < 0) return -1; |