diff options
| author | Jun Zhao <mypopydev@gmail.com> | 2018-08-11 17:15:39 +0800 |
|---|---|---|
| committer | Jun Zhao <jun.zhao@intel.com> | 2018-08-31 11:08:24 +0800 |
| commit | 3ad0e6724de836a9bf996942490d6d9146873188 (patch) | |
| tree | 659db37c34f7eb1614ea5ff5b08b8fb1dea9ab25 | |
| parent | 09e49a8fb082486180de28f46c47fdc2179504be (diff) | |
| download | ffmpeg-3ad0e6724de836a9bf996942490d6d9146873188.tar.gz | |
lavc/pthread: use THREAD_SAFE_CALLBACKS() to simplifx more code
use THREAD_SAFE_CALLBACKS() to simplifx more code
Signed-off-by: Jun Zhao <mypopydev@gmail.com>
| -rw-r--r-- | libavcodec/pthread_frame.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 5104b1beba..36ac0ac1e5 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -908,8 +908,7 @@ static int thread_get_buffer_internal(AVCodecContext *avctx, ThreadFrame *f, int } pthread_mutex_lock(&p->parent->buffer_mutex); - if (avctx->thread_safe_callbacks || - avctx->get_buffer2 == avcodec_default_get_buffer2) { + if (THREAD_SAFE_CALLBACKS(avctx)) { err = ff_get_buffer(avctx, f->f, flags); } else { pthread_mutex_lock(&p->progress_mutex); @@ -976,8 +975,7 @@ void ff_thread_release_buffer(AVCodecContext *avctx, ThreadFrame *f) FrameThreadContext *fctx; AVFrame *dst, *tmp; int can_direct_free = !(avctx->active_thread_type & FF_THREAD_FRAME) || - avctx->thread_safe_callbacks || - avctx->get_buffer2 == avcodec_default_get_buffer2; + THREAD_SAFE_CALLBACKS(avctx); if (!f->f || !f->f->buf[0]) return; |