From c6ccb96bc955b2087ec71033d99b3dcd5203eaf2 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rsbultje@gmail.com>
Date: Fri, 16 Mar 2012 14:16:56 -0700
Subject: [PATCH] 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
---
libavcodec/mpegvideo.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 8be596b39e1..a239a6a294b 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);
}
}
--
GitLab