Merge commit '94660c35'

* commit '94660c35':
  threads: always call thread_finish_setup for intra codecs
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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);