fix global name conflicts patch by ("Ronald S. Bultje" <R dot S dot Bultje at student...

[ffmpeg] / libavformat / allformats.c

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 9feaa987c39a371446be14307ea1c5a9e4f20da4..2ea2118951f018595f109d472bc115689a7b77ba 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -45,7 +45,7 @@ void av_register_all(void)
     avienc_init();
 #endif //CONFIG_ENCODERS
     avidec_init();
-    wav_init();
+    ff_wav_init();
     swf_init();
     au_init();
 #ifdef CONFIG_ENCODERS
@@ -56,7 +56,7 @@ void av_register_all(void)
     movenc_init();
     jpeg_init();
 #endif //CONFIG_ENCODERS
-    dv_init();
+    ff_dv_init();
     fourxm_init();
 #ifdef CONFIG_ENCODERS
     flvenc_init();