har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove use of deprecated functions av_image_fill_pointers/linesizes in

Browse Source 
libavcodec/utils.c, fix warnings.

Originally committed as revision 25069 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-09-07 21:24:03 +00:00
parent 4afbcf46c9
commit 9d2e0ad824
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/utils.c
View File

@ -283,7 +283,7 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){
do { do {
// NOTE: do not align linesizes individually, this breaks e.g. assumptions // 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 // 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) // increase alignment of w for next try (rhs gives the lowest bit set in w)
w += w & ~(w-1); w += w & ~(w-1);
@ -293,7 +293,7 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){
} }
} while (unaligned); } 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) if (tmpsize < 0)
return -1; return -1;