Commit 3ad0e672 authored by Jun Zhao's avatar Jun Zhao Committed by Jun Zhao

lavc/pthread: use THREAD_SAFE_CALLBACKS() to simplifx more code

use THREAD_SAFE_CALLBACKS() to simplifx more code
Signed-off-by: 's avatarJun Zhao <mypopydev@gmail.com>
parent 09e49a8f
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment