diff options
| author | trav90 <travawine@palemoon.org> | 2022-05-30 14:44:19 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2022-05-30 14:49:22 -0500 |
| commit | 8510f335c3ff39c207d8cb906da3eb91cd73d75a (patch) | |
| tree | 88bc89f66bc6b15e27dab678d34c43aaad75de80 /libs/ffvpx/libavcodec/pthread_frame.c | |
| parent | f11b40c3ab4a5a766b0b71ab1e9a6199b23bbfeb (diff) | |
| download | aura-central-8510f335c3ff39c207d8cb906da3eb91cd73d75a.tar.gz | |
[Libs:ffvpx] Update FFVPX to version 4.2.7
Diffstat (limited to 'libs/ffvpx/libavcodec/pthread_frame.c')
| -rw-r--r-- | libs/ffvpx/libavcodec/pthread_frame.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/ffvpx/libavcodec/pthread_frame.c b/libs/ffvpx/libavcodec/pthread_frame.c index 5104b1beb..36ac0ac1e 100644 --- a/libs/ffvpx/libavcodec/pthread_frame.c +++ b/libs/ffvpx/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; |