RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Ronald S. Bultje 2004-03-13 23:04:37 +00:00 committed by Michael Niedermayer
parent 8be014e027
commit c3775e542f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/allformats.c
View File

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

4
libavformat/avformat.h
View File

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

2
libavformat/dv.c
View File

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

2
libavformat/wav.c
View File

@ -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