1. ffmpeg
  2. Commit 3048fae63c990356f850bcabd9bb65a71faf6b0a
Browse code

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>

Clément Bœsch authored on 2013/01/02 14:05:55
Showing 3 changed files
libavcodec/allcodecs.c
History View file @ 3048fae
... ... 
@@ -48,9 +48,7 @@
48 48 
             avcodec_register(&ff_##x##_decoder);                        \
49 49 
     }
50 50
51 
-#define REGISTER_ENCDEC(X, x)                                           \
52 
-    REGISTER_ENCODER(X, x);                                             \
53 
-    REGISTER_DECODER(X,x)
51 
+#define REGISTER_ENCDEC(X, x) REGISTER_ENCODER(X, x); REGISTER_DECODER(X, x)
54 52
55 53 
 #define REGISTER_PARSER(X, x)                                           \
56 54 
     {                                                                   \
libavdevice/alldevices.c
History View file @ 3048fae
... ... 
@@ -36,9 +36,7 @@
36 36 
             av_register_input_format(&ff_##x##_demuxer);                \
37 37 
     }
38 38
39 
-#define REGISTER_INOUTDEV(X, x)                                         \
40 
-    REGISTER_OUTDEV(X, x);                                              \
41 
-    REGISTER_INDEV(X, x)
39 
+#define REGISTER_INOUTDEV(X, x) REGISTER_OUTDEV(X, x); REGISTER_INDEV(X, x)
42 40
43 41 
 void avdevice_register_all(void)
44 42 
 {
libavformat/allformats.c
History View file @ 3048fae
... ... 
@@ -39,9 +39,7 @@
39 39 
             av_register_input_format(&ff_##x##_demuxer);                \
40 40 
     }
41 41
42 
-#define REGISTER_MUXDEMUX(X, x)                                         \
43 
-    REGISTER_MUXER(X, x);                                               \
44 
-    REGISTER_DEMUXER(X,x)
42 
+#define REGISTER_MUXDEMUX(X, x) REGISTER_MUXER(X, x); REGISTER_DEMUXER(X, x)
45 43
46 44 
 #define REGISTER_PROTOCOL(X, x)                                         \
47 45 
     {                                                                   \