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

fix global name conflicts patch by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@2884 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

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();

libavformat/avformat.h

@@ -425,7 +425,7 @@ int au_init(void);
 int amr_init(void);
 
 /* wav.c */
-int wav_init(void);
+int ff_wav_init(void);
 
 /* raw.c */
 int pcm_read_seek(AVFormatContext *s, 
@@ -442,7 +442,7 @@ int yuv4mpeg_init(void);
 int ogg_init(void);
 
 /* dv.c */
-int dv_init(void);
+int ff_dv_init(void);
 
 /* ffm.c */
 int ffm_init(void);

libavformat/dv.c

@@ -908,7 +908,7 @@ static AVOutputFormat dv_oformat = {
     dv_write_trailer,
 };
 
-int dv_init(void)
+int ff_dv_init(void)
 {
     av_register_input_format(&dv_iformat);
     av_register_output_format(&dv_oformat);

libavformat/wav.c

@@ -376,7 +376,7 @@ static AVOutputFormat wav_oformat = {
 };
 #endif //CONFIG_ENCODERS
 
-int wav_init(void)
+int ff_wav_init(void)
 {
     av_register_input_format(&wav_iformat);
 #ifdef CONFIG_ENCODERS