---
libavcodec/thread.h | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/libavcodec/thread.h b/libavcodec/thread.h
index eefce2a..5d392e8 100644
--- a/libavcodec/thread.h
+++ b/libavcodec/thread.h
@@ -48,7 +48,7 @@ void ff_delayed_release_buffer(AVCodecContext *avctx, AVFrame *f);
#define USE_FRAME_THREADING(avctx) (avctx->thread_algorithm == FF_THREAD_MULTIFRAME)
#define USE_AVCODEC_EXECUTE(avctx) (avctx->thread_algorithm == FF_THREAD_MULTISLICE)
#else
-static int ff_thread_init(AVCodecContext *avctx) {return 0;}
+static int ff_thread_init(AVCodecContext *avctx, int thread_count) {return 0;}
static void ff_thread_free(AVCodecContext *avctx) {}
static void ff_validate_thread_parameters(AVCodecContext *avctx) {}
@@ -58,12 +58,19 @@ static void ff_frame_thread_free(AVCodecContext *avctx) {}
static void ff_frame_thread_flush(AVCodecContext *avctx) {}
#define ff_report_predecode_done(avctx) {}
-#define ff_report_decode_progress(avctx) {}
-#define ff_await_decode_progress(avctx) {}
+#define ff_report_decode_progress(avctx, progress) {}
+#define ff_await_decode_progress(avctx, progress) {}
+
+static int ff_decode_frame_threaded(AVCodecContext *avctx,
+ void *data, int *data_size,
+ const uint8_t *buf, int buf_size)
+{
+ return avctx->codec->decode(avctx, data, data_size, buf, buf_size);
+}
static int ff_get_buffer(AVCodecContext *avctx, AVFrame *f)
{
- int ret = avctx->get_buffer(c, f);
+ int ret = avctx->get_buffer(avctx, f);
f->avctx = avctx;
return ret;
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc