generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ff_asts_init needs to be inside #ifdef CONFIG_MUXERS, remove some misplaced

Browse Source 
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:
Luca Abeni 2006-02-17 21:06:51 +00:00 committed by Diego Biurrun
parent 1b137298fa
commit 8cecedfbe8
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/adtsenc.c
View File

@ -104,7 +104,6 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
return 0; return 0;
} }
#ifdef CONFIG_MUXERS
static AVOutputFormat adts_oformat = { static AVOutputFormat adts_oformat = {
"adts", "adts",
"ADTS AAC", "ADTS AAC",
@ -117,12 +116,9 @@ static AVOutputFormat adts_oformat = {
adts_write_packet, adts_write_packet,
adts_write_trailer, adts_write_trailer,
}; };
#endif //CONFIG_MUXERS
int ff_adts_init(void) int ff_adts_init(void)
{ {
#ifdef CONFIG_MUXERS
av_register_output_format(&adts_oformat); av_register_output_format(&adts_oformat);
#endif //CONFIG_MUXERS
return 0; return 0;
} }

2
libavformat/allformats.c
View File

@ -55,8 +55,8 @@ void av_register_all(void)
swf_init(); swf_init();
au_init(); au_init();
ff_aiff_init(); ff_aiff_init();
ff_adts_init();
#ifdef CONFIG_MUXERS #ifdef CONFIG_MUXERS
ff_adts_init();
gif_init(); gif_init();
#endif //CONFIG_MUXERS #endif //CONFIG_MUXERS
mov_init(); mov_init();