diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 22:25:57 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 23:39:47 +0300 |
| commit | f275f9eaee9c69bcbc732002f0ee36f480eebb85 (patch) | |
| tree | 8262a8aee25ee9ff50bc036381c542f474bb0ba3 /libavcodec/mpegvideo_enc.c | |
| parent | 179527f34ea01a2a9b936acde1cb562780db98a6 (diff) | |
| parent | 4e17946f10d39eec6cc03fb249ae8147373141b6 (diff) | |
Merge commit '4e17946f10d39eec6cc03fb249ae8147373141b6'
* commit '4e17946f10d39eec6cc03fb249ae8147373141b6':
mpegvideo: Rework various functions not to use MpegEncContext directly
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 4320ce3cbc..6b1286a395 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -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]; |