diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2012-12-30 07:17:33 +0100 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2012-12-30 07:18:21 +0100 |
| commit | 613001d75fee9dfef14fb000cac8c67ac6381e97 (patch) | |
| tree | ac06a4d7cfda8c2971f957bda2be4f33635e8c4b | |
| parent | c83002a4f8042ccfa0688a9a18e8fa0369c1fda8 (diff) | |
Merge back some registering macros in all*.c.
This breaks the sed in configure:find_things(). Fixes regression from
c73c87b. Fixes Ticket2079.
Found-by: jamal
| -rw-r--r-- | libavcodec/allcodecs.c | 5 | ||||
| -rw-r--r-- | libavdevice/alldevices.c | 5 | ||||
| -rw-r--r-- | libavformat/allformats.c | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 6dbc9b2bcd..15106f3653 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -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) \ { \ diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index 1abf21b50d..d1a5fd81c4 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -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) { diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 739f5a1f76..e831398f37 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -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) \ { \ |