[Ffmpeg-cvslog] CVS: ffmpeg/libavformat adtsenc.c, 1.1, 1.2 allformats.c, 1.60, 1.61

[Diego Biurrun CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv16292/libavformat

Modified Files:
	adtsenc.c allformats.c 
Log Message:
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


Index: adtsenc.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/adtsenc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- adtsenc.c	10 Feb 2006 01:24:32 -0000	1.1
+++ adtsenc.c	17 Feb 2006 21:06:51 -0000	1.2
@@ -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;
 }

Index: allformats.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/allformats.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- allformats.c	17 Feb 2006 03:17:42 -0000	1.60
+++ allformats.c	17 Feb 2006 21:06:51 -0000	1.61
@@ -55,8 +55,8 @@
     swf_init();
     au_init();
     ff_aiff_init();
-    ff_adts_init();
 #ifdef CONFIG_MUXERS
+    ff_adts_init();
     gif_init();
 #endif //CONFIG_MUXERS
     mov_init();