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 /libavformat/allformats.c | |
| parent | c83002a4f8042ccfa0688a9a18e8fa0369c1fda8 (diff) | |
| download | ffmpeg-613001d75fee9dfef14fb000cac8c67ac6381e97.tar.gz | |
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
Diffstat (limited to 'libavformat/allformats.c')
| -rw-r--r-- | libavformat/allformats.c | 5 |
1 files changed, 2 insertions, 3 deletions
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) \ { \ |