diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-01-02 06:05:55 +0100 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-01-03 15:11:25 +0200 |
| commit | 3048fae63c990356f850bcabd9bb65a71faf6b0a (patch) | |
| tree | f6bef4d63b9cf64ba47497ca8dc6da73ca266ee3 | |
| parent | 7768a635c4ea15a9f3b2a602cc6aac3e629e7480 (diff) | |
| download | ffmpeg-3048fae63c990356f850bcabd9bb65a71faf6b0a.tar.gz | |
build: Avoid detecting bogus components named 'x'
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 <diego@biurrun.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavcodec/allcodecs.c | 4 | ||||
| -rw-r--r-- | libavdevice/alldevices.c | 4 | ||||
| -rw-r--r-- | libavformat/allformats.c | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 878d3de3bc..5786719692 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 5d419b0f40..155f7a8ee6 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 9a5e2b74ef..34cf566b0f 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) \ { \ |