From f900d601784ca69b5760bff5cb8f6dae333a79da Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 11 Feb 2012 20:11:18 +0100 Subject: [PATCH] h264: Mark previous field as done before throwing it away. This fixes some deadlock without the generic cleanup code. Signed-off-by: Michael Niedermayer --- libavcodec/h264.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 48aaddfe68..b9057ad122 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2943,6 +2943,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ } else { if (s0->current_picture_ptr->frame_num != h->frame_num) { + ff_thread_report_progress((AVFrame*)s0->current_picture_ptr, INT_MAX, + s0->picture_structure==PICT_BOTTOM_FIELD); /* * This and previous field had * different frame_nums. Consider this field first in -- 2.11.0