virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/pthread: Make sure ff_thread_finish_setup() conditions match

Browse Source 
Prevents warning from being shown due to multiple calls.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-25 15:55:01 +02:00
parent 32a6dfeb12
commit 94b3a666fa
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/pthread.c
View File

@ -362,6 +362,9 @@ static int thread_init(AVCodecContext *avctx)
return 0;
}
#define THREAD_SAFE_CALLBACKS(avctx) \
((avctx)->thread_safe_callbacks || (!(avctx)->get_buffer && (avctx)->get_buffer2 == avcodec_default_get_buffer2))
/**
* Codec worker thread.
*
@ -383,11 +386,7 @@ static attribute_align_arg void *frame_worker_thread(void *arg)
if (fctx->die) break;
if (!codec->update_thread_context && (avctx->thread_safe_callbacks || (
#if FF_API_GET_BUFFER
!avctx->get_buffer &&
#endif
avctx->get_buffer2 == avcodec_default_get_buffer2)))
if (!codec->update_thread_context && THREAD_SAFE_CALLBACKS(avctx))
ff_thread_finish_setup(avctx);
avcodec_get_frame_defaults(&p->frame);
@ -1026,7 +1025,7 @@ static int thread_get_buffer_internal(AVCodecContext *avctx, ThreadFrame *f, int
pthread_mutex_unlock(&p->progress_mutex);
}
if (!avctx->thread_safe_callbacks && !avctx->codec->update_thread_context)
if (!THREAD_SAFE_CALLBACKS(avctx) && !avctx->codec->update_thread_context)
ff_thread_finish_setup(avctx);
if (err)