summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2013-06-06 20:17:36 +0000
committerPaul B Mahol <onemda@gmail.com>2013-06-06 20:17:36 +0000
commit61d900fd0df6e29674fc453db0c0dcc9cb2ba6b9 (patch)
tree9f23504c1e4c14be109671e5b817a21eb47c905a /libavcodec
parentffb1051b9b9b876aba109d6ae402ab3a50183554 (diff)
lavc: add ONLY_IF_THREADS_ENABLED where it is missing
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/alac.c2
-rw-r--r--libavcodec/ffv1dec.c4
-rw-r--r--libavcodec/flacdec.c2
-rw-r--r--libavcodec/takdec.c2
-rw-r--r--libavcodec/tta.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 9a6a118148..c6f01b329f 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -632,7 +632,7 @@ AVCodec ff_alac_decoder = {
.init = alac_decode_init,
.close = alac_decode_close,
.decode = alac_decode_frame,
- .init_thread_copy = init_thread_copy,
+ .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy),
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
.long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"),
};
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index ddd307fddf..17b894645f 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -962,8 +962,8 @@ AVCodec ff_ffv1_decoder = {
.init = decode_init,
.close = ffv1_close,
.decode = decode_frame,
- .init_thread_copy = init_thread_copy,
- .update_thread_context = update_thread_context,
+ .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy),
+ .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context),
.capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/ |
CODEC_CAP_FRAME_THREADS | CODEC_CAP_SLICE_THREADS,
.long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"),
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 22f6651acf..2d3e4b3f70 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -596,7 +596,7 @@ AVCodec ff_flac_decoder = {
.init = flac_decode_init,
.close = flac_decode_close,
.decode = flac_decode_frame,
- .init_thread_copy = init_thread_copy,
+ .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy),
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
.long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"),
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16,
diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c
index 9878303c70..c9c861c6e3 100644
--- a/libavcodec/takdec.c
+++ b/libavcodec/takdec.c
@@ -931,7 +931,7 @@ AVCodec ff_tak_decoder = {
.init = tak_decode_init,
.close = tak_decode_close,
.decode = tak_decode_frame,
- .update_thread_context = update_thread_context,
+ .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context),
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
.long_name = NULL_IF_CONFIG_SMALL("TAK (Tom's lossless Audio Kompressor)"),
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P,
diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index ae16f49509..710aa359d1 100644
--- a/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@ -446,7 +446,7 @@ AVCodec ff_tta_decoder = {
.init = tta_decode_init,
.close = tta_decode_close,
.decode = tta_decode_frame,
- .init_thread_copy = init_thread_copy,
+ .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy),
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
.long_name = NULL_IF_CONFIG_SMALL("TTA (True Audio)"),
.priv_class = &tta_decoder_class,