diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-23 10:12:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-23 10:12:58 +0200 |
| commit | 7c49c8b0ac30ef90964dbd0b2a8acd8f2d40f4a3 (patch) | |
| tree | 6c0034461be8f9654f344c4f3bb63c38212bde81 /libavcodec | |
| parent | a9a537b154aaa48bc8154b2c4472f01eb9750784 (diff) | |
| parent | 94660c35249e11c53b9a9f0c2f85c4335b21eda7 (diff) | |
| download | ffmpeg-streaming-7c49c8b0ac30ef90964dbd0b2a8acd8f2d40f4a3.zip ffmpeg-streaming-7c49c8b0ac30ef90964dbd0b2a8acd8f2d40f4a3.tar.gz | |
Merge commit '94660c35249e11c53b9a9f0c2f85c4335b21eda7'
* commit '94660c35249e11c53b9a9f0c2f85c4335b21eda7':
threads: always call thread_finish_setup for intra codecs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 7e33ba5..1e33fbc 100644 --- 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); |
