diff options
| author | Luca Abeni <lucabe72@email.it> | 2006-02-17 21:06:51 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-02-17 21:06:51 +0000 |
| commit | 8cecedfbe832609da509eb7205155e0b153e0dd4 (patch) | |
| tree | bc252d34341a2135ec7abb3ea9331e681250926c | |
| parent | 1b137298fa260b6119a872a1a2c6f9a99cfab283 (diff) | |
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
| -rw-r--r-- | libavformat/adtsenc.c | 4 | ||||
| -rw-r--r-- | libavformat/allformats.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index 55f8831af1..72e6c0e259 100644 --- a/libavformat/adtsenc.c +++ b/libavformat/adtsenc.c @@ -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; } diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 51fbd3edda..7d2241447c 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -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(); |