"put_s should store signed values. Spotted on #mplayerdev by someone I

[ffmpeg] / libavformat / allformats.c

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 2367c47910221f4bb5ca0bcf0a2943d688fe7864..bc7eff5066d4b042ca666f18edbfe2d9fc36888f 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -26,31 +26,46 @@
  */
 void av_register_all(void)
 {
+    static int inited = 0;
+    
+    if (inited != 0)
+        return;
+    inited = 1;
+
     avcodec_init();
     avcodec_register_all();
 
     mpegps_init();
     mpegts_init();
+#ifdef CONFIG_ENCODERS
     crc_init();
     img_init();
+    img2_init();
+#endif //CONFIG_ENCODERS
     raw_init();
     mp3_init();
     rm_init();
-#ifdef CONFIG_RISKY
     asf_init();
-#endif
+#ifdef CONFIG_ENCODERS
     avienc_init();
+#endif //CONFIG_ENCODERS
     avidec_init();
-    wav_init();
+    ff_wav_init();
     swf_init();
     au_init();
+#ifdef CONFIG_ENCODERS
     gif_init();
+#endif //CONFIG_ENCODERS
     mov_init();
+#ifdef CONFIG_ENCODERS
     movenc_init();
     jpeg_init();
-    dv_init();
+#endif //CONFIG_ENCODERS
+    ff_dv_init();
     fourxm_init();
+#ifdef CONFIG_ENCODERS
     flvenc_init();
+#endif //CONFIG_ENCODERS
     flvdec_init();
     str_init();
     roq_init();
@@ -59,19 +74,19 @@ void av_register_all(void)
     westwood_init();
     film_init();
     idcin_init();
+    flic_init();
+    vmd_init();
 
 #if defined(AMR_NB) || defined(AMR_NB_FIXED) || defined(AMR_WB)
     amr_init();
 #endif
     yuv4mpeg_init();
     
-#ifdef CONFIG_VORBIS
+#ifdef CONFIG_LIBOGG
     ogg_init();
 #endif
 
-#ifndef CONFIG_WIN32
     ffm_init();
-#endif
 #ifdef CONFIG_VIDEO4LINUX
     video_grab_init();
 #endif
@@ -83,9 +98,19 @@ void av_register_all(void)
     dv1394_init();
 #endif
 
+#ifdef CONFIG_DC1394
+    dc1394_init();
+#endif
+
     nut_init();
+    matroska_init();
+    sol_init();
+    ea_init();
+    nsvdec_init();
 
+#ifdef CONFIG_ENCODERS
     /* image formats */
+#if 0
     av_register_image_format(&pnm_image_format);
     av_register_image_format(&pbm_image_format);
     av_register_image_format(&pgm_image_format);
@@ -97,7 +122,10 @@ void av_register_all(void)
     av_register_image_format(&png_image_format);
 #endif
     av_register_image_format(&jpeg_image_format);
-    av_register_image_format(&gif_image_format);
+#endif
+    av_register_image_format(&gif_image_format);  
+//    av_register_image_format(&sgi_image_format); heap corruption, dont enable
+#endif //CONFIG_ENCODERS
 
     /* file protocols */
     register_protocol(&file_protocol);