From 3048fae63c990356f850bcabd9bb65a71faf6b0a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Wed, 2 Jan 2013 06:05:55 +0100 Subject: [PATCH] build: Avoid detecting bogus components named 'x' MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The function find_things() in configure is confused by component registration calls as part of multiline macros defining combined component registration. Coalesce those macros into one line to work around the issue. Signed-off-by: Diego Biurrun Signed-off-by: Martin Storsjö --- libavcodec/allcodecs.c | 4 +--- libavdevice/alldevices.c | 4 +--- libavformat/allformats.c | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 878d3de..5786719 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -48,9 +48,7 @@ avcodec_register(&ff_##x##_decoder); \ } -#define REGISTER_ENCDEC(X, x) \ - REGISTER_ENCODER(X, x); \ - REGISTER_DECODER(X,x) +#define REGISTER_ENCDEC(X, x) REGISTER_ENCODER(X, x); REGISTER_DECODER(X, x) #define REGISTER_PARSER(X, x) \ { \ diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index 5d419b0..155f7a8 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -36,9 +36,7 @@ av_register_input_format(&ff_##x##_demuxer); \ } -#define REGISTER_INOUTDEV(X, x) \ - REGISTER_OUTDEV(X, x); \ - REGISTER_INDEV(X, x) +#define REGISTER_INOUTDEV(X, x) REGISTER_OUTDEV(X, x); REGISTER_INDEV(X, x) void avdevice_register_all(void) { diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 9a5e2b7..34cf566 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -39,9 +39,7 @@ av_register_input_format(&ff_##x##_demuxer); \ } -#define REGISTER_MUXDEMUX(X, x) \ - REGISTER_MUXER(X, x); \ - REGISTER_DEMUXER(X,x) +#define REGISTER_MUXDEMUX(X, x) REGISTER_MUXER(X, x); REGISTER_DEMUXER(X, x) #define REGISTER_PROTOCOL(X, x) \ { \ -- 2.7.4