har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Avoid detecting bogus components named 'x'

Browse Source 
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>
This commit is contained in:
Clément Bœsch 2013-01-02 06:05:55 +01:00 committed by Martin Storsjö
parent 7768a635c4
commit 3048fae63c
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/allcodecs.c
View File

@ -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) \
{ \ { \

4
libavdevice/alldevices.c
View File

@ -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)
{ {

4
libavformat/allformats.c
View File

@ -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) \
{ \ { \