[FFmpeg-cvslog] lavc: update the fallback versions of ff_thread_*

Anton Khirnov git at videolan.org
Tue Mar 12 16:41:55 CET 2013


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Fri Mar  8 08:43:32 2013 +0100| [7c45087b8441441fc929a6df363f6fa010ef23b0] | committer: Anton Khirnov

lavc: update the fallback versions of ff_thread_*

Fixes build without threads after
759001c534287a96dc96d1e274665feb7059145d.

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

 libavcodec/utils.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 62fc1b5..2591428 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -2315,26 +2315,26 @@ int ff_thread_ref_frame(ThreadFrame *dst, ThreadFrame *src)
 
 #if !HAVE_THREADS
 
-int ff_thread_get_buffer(AVCodecContext *avctx, AVFrame *f, int flags)
+int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags)
 {
     f->owner = avctx;
-    return ff_get_buffer(avctx, f, flags);
+    return ff_get_buffer(avctx, f->f, flags);
 }
 
-void ff_thread_release_buffer(AVCodecContext *avctx, AVFrame *f)
+void ff_thread_release_buffer(AVCodecContext *avctx, ThreadFrame *f)
 {
-    av_frame_unref(f);
+    av_frame_unref(f->f);
 }
 
 void ff_thread_finish_setup(AVCodecContext *avctx)
 {
 }
 
-void ff_thread_report_progress(AVFrame *f, int progress, int field)
+void ff_thread_report_progress(ThreadFrame *f, int progress, int field)
 {
 }
 
-void ff_thread_await_progress(AVFrame *f, int progress, int field)
+void ff_thread_await_progress(ThreadFrame *f, int progress, int field)
 {
 }
 



More information about the ffmpeg-cvslog mailing list