Commit c6ccb96b authored by Ronald S. Bultje's avatar 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@libav.org
parent 80387f0e
...@@ -1409,8 +1409,7 @@ void ff_MPV_frame_end(MpegEncContext *s) ...@@ -1409,8 +1409,7 @@ void ff_MPV_frame_end(MpegEncContext *s)
s->avctx->coded_frame = &s->current_picture_ptr->f; s->avctx->coded_frame = &s->current_picture_ptr->f;
if (s->codec_id != CODEC_ID_H264 && s->current_picture.f.reference) { if (s->codec_id != CODEC_ID_H264 && s->current_picture.f.reference) {
ff_thread_report_progress(&s->current_picture_ptr->f, ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX, 0);
s->mb_height - 1, 0);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment