You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-15 14:13:16 +02:00
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
This commit is contained in:
@@ -48,9 +48,8 @@
|
|||||||
avcodec_register(&ff_##x##_decoder); \
|
avcodec_register(&ff_##x##_decoder); \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define REGISTER_ENCDEC(X, x) \
|
/* Warning: do not split this line, it will break configure script */
|
||||||
REGISTER_ENCODER(X, x); \
|
#define REGISTER_ENCDEC(X, x) REGISTER_ENCODER(X, x); REGISTER_DECODER(X,x)
|
||||||
REGISTER_DECODER(X,x)
|
|
||||||
|
|
||||||
#define REGISTER_PARSER(X, x) \
|
#define REGISTER_PARSER(X, x) \
|
||||||
{ \
|
{ \
|
||||||
|
@@ -35,9 +35,8 @@
|
|||||||
av_register_input_format(&ff_##x##_demuxer); \
|
av_register_input_format(&ff_##x##_demuxer); \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define REGISTER_INOUTDEV(X, x) \
|
/* Warning: do not split this line, it will break configure script */
|
||||||
REGISTER_OUTDEV(X, x); \
|
#define REGISTER_INOUTDEV(X, x) REGISTER_OUTDEV(X, x); REGISTER_INDEV(X, x)
|
||||||
REGISTER_INDEV(X, x)
|
|
||||||
|
|
||||||
void avdevice_register_all(void)
|
void avdevice_register_all(void)
|
||||||
{
|
{
|
||||||
|
@@ -39,9 +39,8 @@
|
|||||||
av_register_input_format(&ff_##x##_demuxer); \
|
av_register_input_format(&ff_##x##_demuxer); \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define REGISTER_MUXDEMUX(X, x) \
|
/* Warning: do not split this line, it will break configure script */
|
||||||
REGISTER_MUXER(X, x); \
|
#define REGISTER_MUXDEMUX(X, x) REGISTER_MUXER(X, x); REGISTER_DEMUXER(X,x)
|
||||||
REGISTER_DEMUXER(X,x)
|
|
||||||
|
|
||||||
#define REGISTER_PROTOCOL(X, x) \
|
#define REGISTER_PROTOCOL(X, x) \
|
||||||
{ \
|
{ \
|
||||||
|
Reference in New Issue
Block a user