diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-03-16 14:16:56 -0700 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-04-29 22:07:01 +0200 |
| commit | 87208b8fc4bdd5c2ee635682b4a06fc251dae74d (patch) | |
| tree | d0200e10bc9e470860cafccaf4975cdef144ba87 | |
| parent | 989431c02ffcfdeb210cf42765e820130eb4b255 (diff) | |
| download | ffmpeg-87208b8fc4bdd5c2ee635682b4a06fc251dae74d.tar.gz | |
mpeg4: report frame decoding completion at ff_MPV_frame_end().
Prevents hangs on corrupt input.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit c6ccb96bc955b2087ec71033d99b3dcd5203eaf2)
Conflicts:
libavcodec/mpegvideo.c
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 50e6ad6da4..7aaf398e14 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1415,8 +1415,7 @@ void MPV_frame_end(MpegEncContext *s) s->avctx->coded_frame = (AVFrame *) s->current_picture_ptr; if (s->codec_id != CODEC_ID_H264 && s->current_picture.f.reference) { - ff_thread_report_progress((AVFrame *) s->current_picture_ptr, - s->mb_height - 1, 0); + ff_thread_report_progress((AVFrame *) s->current_picture_ptr, INT_MAX, 0); } } |