From 18a7f7465e7e6b9c3688ffc23230ae7a0639a771 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 11 Feb 2012 20:14:33 +0100 Subject: [PATCH] threads: Perform the generic progress cleanup more carefully. The cleanup is only done now when a picture is returned (assuming that it has to be done when its returned) a error is returned (assuming that there will be no further progress on the frame) the codec is not h264 (this is still needed due to some deadlocks in realvideo) This fixes a decoding regression with 00017.MTS Signed-off-by: Michael Niedermayer --- libavcodec/pthread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 0e64a325b1..9e1c1e24d7 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -388,7 +388,7 @@ static attribute_align_arg void *frame_worker_thread(void *arg) pthread_mutex_lock(&p->progress_mutex); for (i = 0; i < MAX_BUFFERS; i++) - if (p->progress_used[i]) { + if (p->progress_used[i] && (p->got_frame || p->result<0 || avctx->codec_id != CODEC_ID_H264)) { p->progress[i][0] = INT_MAX; p->progress[i][1] = INT_MAX; } -- 2.11.0