[FFmpeg-cvslog] avcodec/pthread_frame: Fix compiling with thread-unsafe-callbacks disabled

Andreas Rheinhardt git at videolan.org
Wed Aug 10 19:40:34 EEST 2022


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Wed Aug 10 08:37:02 2022 +0200| [8fc7f0fdec1aa8d3a9f8ab43e9d7f2eefdcc168a] | committer: Andreas Rheinhardt

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

Forgotten in 02220b88fc38ef9dd4f2d519f5d3e4151258b60c.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8fc7f0fdec1aa8d3a9f8ab43e9d7f2eefdcc168a
---

 libavcodec/pthread_frame.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c
index a54d16fee4..726bd1bcc7 100644
--- a/libavcodec/pthread_frame.c
+++ b/libavcodec/pthread_frame.c
@@ -970,7 +970,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
 
     pthread_mutex_lock(&p->parent->buffer_mutex);
 #if !FF_API_THREAD_SAFE_CALLBACKS
-    err = ff_get_buffer(avctx, f->f, flags);
+    err = ff_get_buffer(avctx, f, flags);
 #else
 FF_DISABLE_DEPRECATION_WARNINGS
     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);
 
 #if !FF_API_THREAD_SAFE_CALLBACKS
-    av_frame_unref(f->f);
+    av_frame_unref(f);
 #else
     // when the frame buffers are not allocated, just reset it to clean state
     if (can_direct_free || !f->buf[0]) {



More information about the ffmpeg-cvslog mailing list