]> git.sesse.net Git - ffmpeg/commitdiff
lavc: add ONLY_IF_THREADS_ENABLED where it is missing
authorPaul B Mahol <onemda@gmail.com>
Thu, 6 Jun 2013 20:17:36 +0000 (20:17 +0000)
committerPaul B Mahol <onemda@gmail.com>
Thu, 6 Jun 2013 20:17:36 +0000 (20:17 +0000)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavcodec/alac.c
libavcodec/ffv1dec.c
libavcodec/flacdec.c
libavcodec/takdec.c
libavcodec/tta.c

index 9a6a11814806152437fa9fb8146939602ac38de0..c6f01b329fb2c51fe437fc3a2a18a251b95b6882 100644 (file)
@@ -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)"),
 };
index ddd307fddfb51724aa22b7e653529da4f1e66ce8..17b894645fec15bdd0d9ab78065d23b718dfec02 100644 (file)
@@ -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"),
index 22f6651acfee12a4608c84dbcb89113385959c7a..2d3e4b3f70b91b339e99e6f268c1dacdf3a27159 100644 (file)
@@ -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,
index 9878303c706b1fb00b0c1751ac0dfc4e11487a17..c9c861c6e3a231a8272d89ef5440ae467d35d975 100644 (file)
@@ -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,
index ae16f49509e8d38bb5e8653e898a79cd805db5b4..710aa359d12cfbc9b8c70efe568b57458b295085 100644 (file)
@@ -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,