[FFmpeg-soc] [patch 04/12] Multithreading commits

[Alexander Strange]

Cosmetics: make thread.h look like other prototypes.


---
 libavcodec/thread.h |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/libavcodec/thread.h b/libavcodec/thread.h
index ebe9a73..fc0b770 100644
--- a/libavcodec/thread.h
+++ b/libavcodec/thread.h
@@ -24,39 +24,39 @@
 #include "avcodec.h"
 
 #ifdef ENABLE_PTHREADS
-int ff_thread_init(AVCodecContext *, int thread_count);
-void ff_thread_free(AVCodecContext *);
+int ff_thread_init(AVCodecContext *avctx, int thread_count);
+void ff_thread_free(AVCodecContext *avctx);
 
-int ff_frame_thread_init(AVCodecContext *);
-void ff_frame_thread_free(AVCodecContext *);
+int ff_frame_thread_init(AVCodecContext *avctx);
+void ff_frame_thread_free(AVCodecContext *avctx);
 
 int ff_decode_frame_threaded(AVCodecContext *avctx,
                         void *data, int *data_size,
                         const uint8_t *buf, int buf_size);
 
-void ff_report_predecode_done(AVCodecContext *);
-void ff_report_decode_progress(AVFrame *, int progress);
-void ff_await_decode_progress(AVFrame *, int progress);
+void ff_report_predecode_done(AVCodecContext *avctx);
+void ff_report_decode_progress(AVFrame *f, int progress);
+void ff_await_decode_progress(AVFrame *f, int progress);
 
-int ff_mt_get_buffer(AVCodecContext *, AVFrame *f);
-void ff_mt_release_buffer(AVFrame *);
+int ff_mt_get_buffer(AVCodecContext *avctx, AVFrame *f);
+void ff_mt_release_buffer(AVFrame *f);
 void ff_mt_delayed_release_buffer(AVCodecContext *avctx, AVFrame *f);
 #else
-static int ff_thread_init(AVCodecContext *) {return 0;}
-static void ff_thread_free(AVCodecContext *) {}
+static int ff_thread_init(AVCodecContext *avctx) {return 0;}
+static void ff_thread_free(AVCodecContext *avctx) {}
 
-static int ff_frame_thread_init(AVCodecContext *) {return 0;}
-static void ff_frame_thread_free(AVCodecContext *) {}
+static int ff_frame_thread_init(AVCodecContext *avctx) {return 0;}
+static void ff_frame_thread_free(AVCodecContext *avctx) {}
 
-#define ff_report_predecode_done(c)  {}
-#define ff_report_decode_progress(c) {}
-#define ff_await_decode_progress(c)  {}
+#define ff_report_predecode_done(avctx)  {}
+#define ff_report_decode_progress(avctx) {}
+#define ff_await_decode_progress(avctx)  {}
 
-static int ff_mt_get_buffer(AVCodecContext *c, AVFrame *f)
+static int ff_mt_get_buffer(AVCodecContext *avctx, AVFrame *f)
 {
-    int ret = c->get_buffer(c, f);
+    int ret = avctx->get_buffer(c, f);
 
-    f->avctx = c;
+    f->avctx = avctx;
     return ret;
 }
 
@@ -64,6 +64,8 @@ static void ff_mt_release_buffer(AVFrame *f)
 {
     f->avctx->release_buffer(f->avctx, f);
 }
+
+#define ff_mt_delayed_release_buffer(avctx, f) ff_mt_release_buffer(f)
 #endif
 
 #endif /* FFMPEG_FRAMEPTHREAD_H */
-- 
1.5.5.1




_______________________________________________
FFmpeg-soc mailing list
FFmpeg-soc@mplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc