Merge back some registering macros in all*.c.
authorClément Bœsch <ubitux@gmail.com>
Sun, 30 Dec 2012 06:17:33 +0000 (07:17 +0100)
committerClément Bœsch <ubitux@gmail.com>
Sun, 30 Dec 2012 06:18:21 +0000 (07:18 +0100)
This breaks the sed in configure:find_things(). Fixes regression from
c73c87b. Fixes Ticket2079.

Found-by: jamal
libavcodec/allcodecs.c
libavdevice/alldevices.c
libavformat/allformats.c

index 6dbc9b2..15106f3 100644 (file)
@@ -48,9 +48,8 @@
             avcodec_register(&ff_##x##_decoder);                        \
     }
 
-#define REGISTER_ENCDEC(X, x)                                           \
-    REGISTER_ENCODER(X, x);                                             \
-    REGISTER_DECODER(X,x)
+/* Warning: do not split this line, it will break configure script */
+#define REGISTER_ENCDEC(X, x) REGISTER_ENCODER(X, x); REGISTER_DECODER(X,x)
 
 #define REGISTER_PARSER(X, x)                                           \
     {                                                                   \
index 1abf21b..d1a5fd8 100644 (file)
@@ -35,9 +35,8 @@
             av_register_input_format(&ff_##x##_demuxer);                \
     }
 
-#define REGISTER_INOUTDEV(X, x)                                         \
-    REGISTER_OUTDEV(X, x);                                              \
-    REGISTER_INDEV(X, x)
+/* Warning: do not split this line, it will break configure script */
+#define REGISTER_INOUTDEV(X, x) REGISTER_OUTDEV(X, x); REGISTER_INDEV(X, x)
 
 void avdevice_register_all(void)
 {
index 739f5a1..e831398 100644 (file)
@@ -39,9 +39,8 @@
             av_register_input_format(&ff_##x##_demuxer);                \
     }
 
-#define REGISTER_MUXDEMUX(X, x)                                         \
-    REGISTER_MUXER(X, x);                                               \
-    REGISTER_DEMUXER(X,x)
+/* Warning: do not split this line, it will break configure script */
+#define REGISTER_MUXDEMUX(X, x) REGISTER_MUXER(X, x); REGISTER_DEMUXER(X,x)
 
 #define REGISTER_PROTOCOL(X, x)                                         \
     {                                                                   \