changeset 962:a0d0542fb5f0 libavformat

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
author diego
date Fri, 17 Feb 2006 21:06:51 +0000
parents d1d7a0e87dea
children 5783108b1478
files adtsenc.c allformats.c
diffstat 2 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/adtsenc.c	Fri Feb 17 03:17:42 2006 +0000
+++ b/adtsenc.c	Fri Feb 17 21:06:51 2006 +0000
@@ -104,7 +104,6 @@
     return 0;
 }
 
-#ifdef CONFIG_MUXERS
 static AVOutputFormat adts_oformat = {
     "adts",
     "ADTS AAC",
@@ -117,12 +116,9 @@
     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;
 }
--- a/allformats.c	Fri Feb 17 03:17:42 2006 +0000
+++ b/allformats.c	Fri Feb 17 21:06:51 2006 +0000
@@ -55,8 +55,8 @@
     swf_init();
     au_init();
     ff_aiff_init();
+#ifdef CONFIG_MUXERS
     ff_adts_init();
-#ifdef CONFIG_MUXERS
     gif_init();
 #endif //CONFIG_MUXERS
     mov_init();