virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/pthread_frame: Fix compiling with thread-unsafe-callbacks disabled

Browse Source 
Forgotten in 02220b88fc.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-08-10 08:37:02 +02:00
parent 0c3e3fd1b4
commit 8fc7f0fdec
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/pthread_frame.c
View File

@@ -970,7 +970,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
pthread_mutex_lock(&p->parent->buffer_mutex); pthread_mutex_lock(&p->parent->buffer_mutex);
#if !FF_API_THREAD_SAFE_CALLBACKS #if !FF_API_THREAD_SAFE_CALLBACKS
err = ff_get_buffer(avctx, f->f, flags); err = ff_get_buffer(avctx, f, flags);
#else #else
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
if (THREAD_SAFE_CALLBACKS(avctx)) { if (THREAD_SAFE_CALLBACKS(avctx)) {
@@ -1091,7 +1091,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_log(avctx, AV_LOG_DEBUG, "thread_release_buffer called on pic %p\n", f); av_log(avctx, AV_LOG_DEBUG, "thread_release_buffer called on pic %p\n", f);
#if !FF_API_THREAD_SAFE_CALLBACKS #if !FF_API_THREAD_SAFE_CALLBACKS
av_frame_unref(f->f); av_frame_unref(f);
#else #else
// when the frame buffers are not allocated, just reset it to clean state // when the frame buffers are not allocated, just reset it to clean state
if (can_direct_free || !f->buf[0]) { if (can_direct_free || !f->buf[0]) {