mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
ff_asts_init needs to be inside #ifdef CONFIG_MUXERS, remove some misplaced
CONFIG_MUXERS from adtsenc.c, fixes compilation with --disable-muxers. patch by Luca Abeni, lucabe72 &at& email &dot& it Originally committed as revision 5030 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
1b137298fa
commit
8cecedfbe8
@ -104,7 +104,6 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_MUXERS
|
||||
static AVOutputFormat adts_oformat = {
|
||||
"adts",
|
||||
"ADTS AAC",
|
||||
@ -117,12 +116,9 @@ static AVOutputFormat adts_oformat = {
|
||||
adts_write_packet,
|
||||
adts_write_trailer,
|
||||
};
|
||||
#endif //CONFIG_MUXERS
|
||||
|
||||
int ff_adts_init(void)
|
||||
{
|
||||
#ifdef CONFIG_MUXERS
|
||||
av_register_output_format(&adts_oformat);
|
||||
#endif //CONFIG_MUXERS
|
||||
return 0;
|
||||
}
|
||||
|
@ -55,8 +55,8 @@ void av_register_all(void)
|
||||
swf_init();
|
||||
au_init();
|
||||
ff_aiff_init();
|
||||
ff_adts_init();
|
||||
#ifdef CONFIG_MUXERS
|
||||
ff_adts_init();
|
||||
gif_init();
|
||||
#endif //CONFIG_MUXERS
|
||||
mov_init();
|
||||
|
Loading…
Reference in New Issue
Block a user