diff options
| -rw-r--r-- | libavcodec/pthread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 404804dec1..1dbfe3d221 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -947,9 +947,9 @@ int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags) 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); |