Mercurial > libavformat.hg

changeset 384:9479dac25620 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix global name conflicts patch by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
author michael
date Sat, 13 Mar 2004 23:04:37 +0000
parents 1674ed5ca2f0
children 2f56d366a787
files allformats.c avformat.h dv.c wav.c
diffstat 4 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/allformats.c	Sat Mar 13 21:02:26 2004 +0000
+++ b/allformats.c	Sat Mar 13 23:04:37 2004 +0000
@@ -45,7 +45,7 @@
     avienc_init();
 #endif //CONFIG_ENCODERS
     avidec_init();
-    wav_init();
+    ff_wav_init();
     swf_init();
     au_init();
 #ifdef CONFIG_ENCODERS
@@ -56,7 +56,7 @@
     movenc_init();
     jpeg_init();
 #endif //CONFIG_ENCODERS
-    dv_init();
+    ff_dv_init();
     fourxm_init();
 #ifdef CONFIG_ENCODERS
     flvenc_init();
--- a/avformat.h	Sat Mar 13 21:02:26 2004 +0000
+++ b/avformat.h	Sat Mar 13 23:04:37 2004 +0000
@@ -425,7 +425,7 @@
 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 ogg_init(void);
 
 /* dv.c */
-int dv_init(void);
+int ff_dv_init(void);
 
 /* ffm.c */
 int ffm_init(void);
--- a/dv.c	Sat Mar 13 21:02:26 2004 +0000
+++ b/dv.c	Sat Mar 13 23:04:37 2004 +0000
@@ -908,7 +908,7 @@
     dv_write_trailer,
 };
 
-int dv_init(void)
+int ff_dv_init(void)
 {
     av_register_input_format(&dv_iformat);
     av_register_output_format(&dv_oformat);
--- a/wav.c	Sat Mar 13 21:02:26 2004 +0000
+++ b/wav.c	Sat Mar 13 23:04:37 2004 +0000
@@ -376,7 +376,7 @@
 };
 #endif //CONFIG_ENCODERS
 
-int wav_init(void)
+int ff_wav_init(void)
 {
     av_register_input_format(&wav_iformat);
 #ifdef CONFIG_ENCODERS