dont write LAVF_ID if bitexact and any meta tag is set

[ffmpeg] / libavformat / allformats.c

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 828487868c09f906f383b33ccd5b47e8e4365ce2..68eef85a10353b2f1e9f9457083f1b872cf65f56 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
 
@@ -26,50 +26,77 @@
  */
 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_MUXERS
     crc_init();
     img_init();
+    img2_init();
+#endif //CONFIG_MUXERS
     raw_init();
     mp3_init();
     rm_init();
-#ifdef CONFIG_RISKY
     asf_init();
-#endif
+#ifdef CONFIG_MUXERS
     avienc_init();
+#endif //CONFIG_MUXERS
     avidec_init();
-    wav_init();
+    ff_wav_init();
+    ff_mmf_init();
     swf_init();
     au_init();
+    ff_aiff_init();
+#ifdef CONFIG_MUXERS
+    ff_adts_init();
     gif_init();
+#endif //CONFIG_MUXERS
     mov_init();
+#ifdef CONFIG_MUXERS
     movenc_init();
     jpeg_init();
-    dv_init();
+#endif //CONFIG_MUXERS
+    ff_dv_init();
     fourxm_init();
+#ifdef CONFIG_MUXERS
     flvenc_init();
+#endif //CONFIG_MUXERS
     flvdec_init();
     str_init();
     roq_init();
     ipmovie_init();
     wc3_init();
+    westwood_init();
+    film_init();
+    idcin_init();
+    flic_init();
+    vmd_init();
+    mm_init();
+    smacker_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();
+#if defined(CONFIG_VIDEO4LINUX2)
+    v4l2_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)
@@ -80,9 +107,24 @@ 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();
+    voc_init();
+    tta_init();
+    avs_init();
+    nuv_init();
 
+#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);
@@ -94,8 +136,12 @@ void av_register_all(void)
     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); heap corruption, dont enable
+#endif //CONFIG_MUXERS
 
+#ifdef CONFIG_PROTOCOLS
     /* file protocols */
     register_protocol(&file_protocol);
     register_protocol(&pipe_protocol);
@@ -107,4 +153,5 @@ void av_register_all(void)
     register_protocol(&tcp_protocol);
     register_protocol(&http_protocol);
 #endif
+#endif
 }