[FFmpeg-cvslog] mpeg4: report frame decoding completion at ff_MPV_frame_end().
Ronald S. Bultje
git at videolan.org
Sat Mar 17 23:52:39 CET 2012
ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Fri Mar 16 14:16:56 2012 -0700| [c6ccb96bc955b2087ec71033d99b3dcd5203eaf2] | committer: Ronald S. Bultje
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 at libav.org
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c6ccb96bc955b2087ec71033d99b3dcd5203eaf2
---
libavcodec/mpegvideo.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 8be596b..a239a6a 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);
}
}
More information about the ffmpeg-cvslog
mailing list