---
libavcodec/h263dec.c | 2 +-
libavcodec/mdec.c | 2 +-
libavcodec/mimic.c | 2 +-
libavcodec/mpeg12.c | 2 +-
libavutil/common.h | 6 ++++++
5 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 9e5d994..ef58ab3 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -729,7 +729,7 @@ AVCodec mpeg4_decoder = {
CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | CODEC_CAP_FRAME_THREADS,
.flush= ff_mpeg_flush,
.long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2"),
- .update_context= ff_mpeg_update_context
+ .update_context= ONLY_IF_THREADS_ENABLED(ff_mpeg_update_context)
};
AVCodec h263_decoder = {
diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c
index 44e78f2..e4392c7 100644
--- a/libavcodec/mdec.c
+++ b/libavcodec/mdec.c
@@ -266,6 +266,6 @@ AVCodec mdec_decoder = {
decode_frame,
CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
.long_name= NULL_IF_CONFIG_SMALL("Sony PlayStation MDEC (Motion DECoder)"),
- .init_copy = decode_init_copy
+ .init_copy= ONLY_IF_THREADS_ENABLED(decode_init_copy)
};
diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c
index 54b8dc7..9507109 100644
--- a/libavcodec/mimic.c
+++ b/libavcodec/mimic.c
@@ -415,5 +415,5 @@ AVCodec mimic_decoder = {
mimic_decode_frame,
CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
.long_name = NULL_IF_CONFIG_SMALL("Mimic"),
- .update_context = mimic_decode_update_context
+ .update_context = ONLY_IF_THREADS_ENABLED(mimic_decode_update_context)
};
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 421fd23..f566a27 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -2471,7 +2471,7 @@ AVCodec mpeg1video_decoder = {
CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | CODEC_CAP_FRAME_THREADS,
.flush= ff_mpeg_flush,
.long_name= NULL_IF_CONFIG_SMALL("MPEG-1 video"),
- .update_context= mpeg_decode_update_context
+ .update_context= ONLY_IF_THREADS_ENABLED(mpeg_decode_update_context)
};
AVCodec mpeg2video_decoder = {
diff --git a/libavutil/common.h b/libavutil/common.h
index 5a56832..04ff96c 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -398,4 +398,10 @@ tend= AV_READ_TIME();\
# define NULL_IF_CONFIG_SMALL(x) x
#endif
+#if ENABLE_THREADS
+# define ONLY_IF_THREADS_ENABLED(x) x
+#else
+# define ONLY_IF_THREADS_ENABLED(x) NULL
+#endif
+
#endif /* FFMPEG_COMMON_H */
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc