Browse Source

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
tags/n1.1
Clément Bœsch 13 years ago
parent
commit
613001d75f
3 changed files with 6 additions and 9 deletions
  1. +2
    -3
      libavcodec/allcodecs.c
  2. +2
    -3
      libavdevice/alldevices.c
  3. +2
    -3
      libavformat/allformats.c

+ 2
- 3
libavcodec/allcodecs.c View File

@@ -48,9 +48,8 @@
avcodec_register(&ff_##x##_decoder); \ 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) \ #define REGISTER_PARSER(X, x) \
{ \ { \


+ 2
- 3
libavdevice/alldevices.c View File

@@ -35,9 +35,8 @@
av_register_input_format(&ff_##x##_demuxer); \ 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) void avdevice_register_all(void)
{ {


+ 2
- 3
libavformat/allformats.c View File

@@ -39,9 +39,8 @@
av_register_input_format(&ff_##x##_demuxer); \ 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) \ #define REGISTER_PROTOCOL(X, x) \
{ \ { \


Loading…
Cancel
Save