[FFmpeg-cvslog] lavc: add ONLY_IF_THREADS_ENABLED where it is missing

Paul B Mahol git at videolan.org
Thu Jun 6 22:20:55 CEST 2013


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Thu Jun  6 20:17:36 2013 +0000| [61d900fd0df6e29674fc453db0c0dcc9cb2ba6b9] | committer: Paul B Mahol

lavc: add ONLY_IF_THREADS_ENABLED where it is missing

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

 libavcodec/alac.c    |    2 +-
 libavcodec/ffv1dec.c |    4 ++--
 libavcodec/flacdec.c |    2 +-
 libavcodec/takdec.c  |    2 +-
 libavcodec/tta.c     |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 9a6a118..c6f01b3 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 ddd307f..17b8946 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 22f6651..2d3e4b3 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 9878303..c9c861c 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 ae16f49..710aa35 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,



More information about the ffmpeg-cvslog mailing list