Make Launch more appropriate with support for full paths for the ffmpeg binary

[ffmpeg] / libavformat / allformats.c

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index cc213f940a172b59c1bd14304f5a8196de0792c6..6603a43d4d1ffa6acadadc9bc0884e5d26506500 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -26,41 +26,47 @@
  */
 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
+#ifdef CONFIG_MUXERS
     crc_init();
     img_init();
-#endif //CONFIG_ENCODERS
+    img2_init();
+#endif //CONFIG_MUXERS
     raw_init();
     mp3_init();
     rm_init();
-#ifdef CONFIG_RISKY
     asf_init();
-#endif
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
     avienc_init();
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
     avidec_init();
-    wav_init();
+    ff_wav_init();
+    ff_mmf_init();
     swf_init();
     au_init();
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
     gif_init();
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
     mov_init();
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
     movenc_init();
     jpeg_init();
-#endif //CONFIG_ENCODERS
-    dv_init();
+#endif //CONFIG_MUXERS
+    ff_dv_init();
     fourxm_init();
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
     flvenc_init();
-#endif //CONFIG_ENCODERS
+#endif //CONFIG_MUXERS
     flvdec_init();
     str_init();
     roq_init();
@@ -69,20 +75,21 @@ 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
+
     ogg_init();
+#ifdef CONFIG_LIBOGG
+    libogg_init();
 #endif
 
-#ifndef CONFIG_WIN32
     ffm_init();
-#endif
-#ifdef CONFIG_VIDEO4LINUX
+#if defined(CONFIG_VIDEO4LINUX) || defined(CONFIG_BKTR)
     video_grab_init();
 #endif
 #if defined(CONFIG_AUDIO_OSS) || defined(CONFIG_AUDIO_BEOS)
@@ -93,10 +100,20 @@ void av_register_all(void)
     dv1394_init();
 #endif
 
+#ifdef CONFIG_DC1394
+    dc1394_init();
+#endif
+
     nut_init();
+    matroska_init();
+    sol_init();
+    ea_init();
+    nsvdec_init();
+    daud_init();
 
-#ifdef CONFIG_ENCODERS
+#ifdef CONFIG_MUXERS
     /* 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);
@@ -108,8 +125,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 //CONFIG_ENCODERS
+#endif
+    av_register_image_format(&gif_image_format);  
+//    av_register_image_format(&sgi_image_format); heap corruption, dont enable
+#endif //CONFIG_MUXERS
 
     /* file protocols */
     register_protocol(&file_protocol);