diff options
| author | Ronald S. Bultje | 2004-03-13 23:04:37 +0000 |
|---|---|---|
| committer | Michael Niedermayer | 2004-03-13 23:04:37 +0000 |
| commit | c3775e542f8fda9eeda31cce1d588d70c2fcd56b (patch) | |
| tree | 9b0d1d916c5aa263a6d2e99f792159fbeb0c7109 | |
| parent | 8be014e027f9c023a45a707c2d77de8d0e5ba79d (diff) | |
fix global name conflicts patch by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
Originally committed as revision 2884 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/allformats.c | 4 | ||||
| -rw-r--r-- | libavformat/avformat.h | 4 | ||||
| -rw-r--r-- | libavformat/dv.c | 2 | ||||
| -rw-r--r-- | libavformat/wav.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 9feaa987c3..2ea2118951 100644 --- 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(); diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 5da4d9c494..7b64e0bbd8 100644 --- a/libavformat/avformat.h +++ b/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); diff --git a/libavformat/dv.c b/libavformat/dv.c index 65e81579ce..a174ee1951 100644 --- a/libavformat/dv.c +++ b/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); diff --git a/libavformat/wav.c b/libavformat/wav.c index 1beb7359da..ea0a781b29 100644 --- a/libavformat/wav.c +++ b/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 |