Merge commit '94660c35249e11c53b9a9f0c2f85c4335b21eda7'

* commit '94660c35249e11c53b9a9f0c2f85c4335b21eda7': threads: always call thread_finish_setup for intra codecs Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 7c49c8b0ac
parent a9a537b154 94660c3524
commit 7c49c8b0ac
1 changed files with 2 additions and 2 deletions
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@ -1025,9 +1025,9 @@ static int thread_get_buffer_internal(AVCodecContext *avctx, ThreadFrame *f, int

        pthread_mutex_unlock(&p->progress_mutex);

-        if (!avctx->codec->update_thread_context)
-            ff_thread_finish_setup(avctx);
    }
+    if (!avctx->thread_safe_callbacks && !avctx->codec->update_thread_context)
+        ff_thread_finish_setup(avctx);

    if (err)
        av_buffer_unref(&f->progress);