---
libavcodec/thread.h | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/libavcodec/thread.h b/libavcodec/thread.h
index 95660ba..900de9c 100644
--- a/libavcodec/thread.h
+++ b/libavcodec/thread.h
@@ -31,8 +31,6 @@
#include "config.h"
#include "avcodec.h"
-#ifdef HAVE_PTHREADS
-
/**
* Wait for all decoding threads to finish and then reset the internal state.
*/
@@ -48,6 +46,8 @@ int ff_decode_frame_threaded(AVCodecContext *avctx,
void *data, int *data_size,
const uint8_t *buf, int buf_size);
+#ifdef HAVE_PTHREADS
+
/**
* If the codec defines update_context, call this after doing
* all setup work for the next thread. update_context will be
@@ -104,25 +104,14 @@ void ff_delayed_release_buffer(AVCodecContext *avctx, AVFrame *f);
#else
//Stub out these functions for systems without pthreads
-static inline void ff_frame_thread_flush(AVCodecContext *avctx) {}
-
static inline void ff_report_predecode_done(AVCodecContext *avctx) {}
static inline void ff_report_decode_progress(AVFrame *f, int progress) {}
static inline void ff_await_decode_progress(AVFrame *f, int progress) {}
-static inline 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 inline int ff_get_buffer(AVCodecContext *avctx, AVFrame *f)
{
- int ret = avctx->get_buffer(avctx, f);
-
f->owner = avctx;
- return ret;
+ return avctx->get_buffer(avctx, f);
}
static inline void ff_release_buffer(AVFrame *f)
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
