diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 21:25:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 22:39:47 +0200 |
| commit | f275f9eaee9c69bcbc732002f0ee36f480eebb85 (patch) | |
| tree | 8262a8aee25ee9ff50bc036381c542f474bb0ba3 /libavcodec/h263dec.c | |
| parent | 179527f34ea01a2a9b936acde1cb562780db98a6 (diff) | |
| parent | 4e17946f10d39eec6cc03fb249ae8147373141b6 (diff) | |
| download | ffmpeg-f275f9eaee9c69bcbc732002f0ee36f480eebb85.tar.gz | |
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/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 1c68ec12e7..89362d209b 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -521,7 +521,7 @@ retry: } if (!s->current_picture_ptr || s->current_picture_ptr->f->data[0]) { - int i = ff_find_unused_picture(s, 0); + int i = ff_find_unused_picture(s->avctx, s->picture, 0); if (i < 0) return i; s->current_picture_ptr = &s->picture[i]; |