prefer integer fps if possible when guessing

[ffmpeg] / libavformat / allformats.c

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index b49d319be184432d90076d7545e88ba4c1156a1d..712269bfadab82ca4c52baff5030f5797c4656c4 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -26,33 +26,60 @@
  */
 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();
+    ipmovie_init();
+    wc3_init();
+    westwood_init();
+    film_init();
+    idcin_init();
+    flic_init();
+    vmd_init();
 
-#ifdef AMR_NB
+#if defined(AMR_NB) || defined(AMR_NB_FIXED) || defined(AMR_WB)
     amr_init();
 #endif
     yuv4mpeg_init();
@@ -75,19 +102,36 @@ 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);
     av_register_image_format(&ppm_image_format);
     av_register_image_format(&pam_image_format);
     av_register_image_format(&pgmyuv_image_format);
+#endif
     av_register_image_format(&yuv_image_format);
+#if 0
 #ifdef CONFIG_ZLIB
     av_register_image_format(&png_image_format);
 #endif
     av_register_image_format(&jpeg_image_format);
+#endif
     av_register_image_format(&gif_image_format);
+    av_register_image_format(&sgi_image_format);
+#endif //CONFIG_ENCODERS
 
     /* file protocols */
     register_protocol(&file_protocol);