generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '4e17946f10d39eec6cc03fb249ae8147373141b6'

Browse Source 
* commit '4e17946f10d39eec6cc03fb249ae8147373141b6':
  mpegvideo: Rework various functions not to use MpegEncContext directly

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-05-22 21:25:57 +02:00
parent 179527f34e 4e17946f10
commit f275f9eaee
4 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpegvideo_enc.c
View File

@@ -1131,7 +1131,7 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg)
ff_dlog(s->avctx, "%d %d %"PTRDIFF_SPECIFIER" %"PTRDIFF_SPECIFIER"\n", pic_arg->linesize[0],
pic_arg->linesize[1], s->linesize, s->uvlinesize);
i = ff_find_unused_picture(s, direct);
i = ff_find_unused_picture(s->avctx, s->picture, direct);
if (i < 0)
return i;
@@ -1528,7 +1528,7 @@ no_output_pic:
// one & ensure that the shared one is reuseable
Picture *pic;
int i = ff_find_unused_picture(s, 0);
int i = ff_find_unused_picture(s->avctx, s->picture, 0);
if (i < 0)
return i;
pic = &s->picture[i];