diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-03-16 14:16:56 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-03-16 15:30:53 -0700 |
| commit | c6ccb96bc955b2087ec71033d99b3dcd5203eaf2 (patch) | |
| tree | 514c21e973b3377ddbc70d8871624697c3fbdcc8 /libavcodec/mpegvideo.c | |
| parent | 80387f0e2568746dce4a68e2217297029a053dae (diff) | |
| download | ffmpeg-c6ccb96bc955b2087ec71033d99b3dcd5203eaf2.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
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -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 8be596b39e..a239a6a294 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1409,8 +1409,7 @@ void ff_MPV_frame_end(MpegEncContext *s) s->avctx->coded_frame = &s->current_picture_ptr->f; if (s->codec_id != CODEC_ID_H264 && s->current_picture.f.reference) { - ff_thread_report_progress(&s->current_picture_ptr->f, - s->mb_height - 1, 0); + ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX, 0); } } |