Commit 3048fae6 authored by Clément Bœsch's avatar Clément Bœsch Committed by Martin Storsjö

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: 's avatarDiego Biurrun <diego@biurrun.de>
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent 7768a635
...@@ -48,9 +48,7 @@ ...@@ -48,9 +48,7 @@
avcodec_register(&ff_##x##_decoder); \ avcodec_register(&ff_##x##_decoder); \
} }
#define REGISTER_ENCDEC(X, x) \ #define REGISTER_ENCDEC(X, x) REGISTER_ENCODER(X, x); REGISTER_DECODER(X, x)
REGISTER_ENCODER(X, x); \
REGISTER_DECODER(X,x)
#define REGISTER_PARSER(X, x) \ #define REGISTER_PARSER(X, x) \
{ \ { \
......
...@@ -36,9 +36,7 @@ ...@@ -36,9 +36,7 @@
av_register_input_format(&ff_##x##_demuxer); \ av_register_input_format(&ff_##x##_demuxer); \
} }
#define REGISTER_INOUTDEV(X, x) \ #define REGISTER_INOUTDEV(X, x) REGISTER_OUTDEV(X, x); REGISTER_INDEV(X, x)
REGISTER_OUTDEV(X, x); \
REGISTER_INDEV(X, x)
void avdevice_register_all(void) void avdevice_register_all(void)
{ {
......
...@@ -39,9 +39,7 @@ ...@@ -39,9 +39,7 @@
av_register_input_format(&ff_##x##_demuxer); \ av_register_input_format(&ff_##x##_demuxer); \
} }
#define REGISTER_MUXDEMUX(X, x) \ #define REGISTER_MUXDEMUX(X, x) REGISTER_MUXER(X, x); REGISTER_DEMUXER(X, x)
REGISTER_MUXER(X, x); \
REGISTER_DEMUXER(X,x)
#define REGISTER_PROTOCOL(X, x) \ #define REGISTER_PROTOCOL(X, x) \
{ \ { \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment