Browse Source

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
tags/v0.5
Ronald S. Bultje Michael Niedermayer 21 years ago
parent
commit
c3775e542f
4 changed files with 6 additions and 6 deletions
  1. +2
    -2
      libavformat/allformats.c
  2. +2
    -2
      libavformat/avformat.h
  3. +1
    -1
      libavformat/dv.c
  4. +1
    -1
      libavformat/wav.c

+ 2
- 2
libavformat/allformats.c View File

@@ -45,7 +45,7 @@ void av_register_all(void)
avienc_init(); avienc_init();
#endif //CONFIG_ENCODERS #endif //CONFIG_ENCODERS
avidec_init(); avidec_init();
wav_init();
ff_wav_init();
swf_init(); swf_init();
au_init(); au_init();
#ifdef CONFIG_ENCODERS #ifdef CONFIG_ENCODERS
@@ -56,7 +56,7 @@ void av_register_all(void)
movenc_init(); movenc_init();
jpeg_init(); jpeg_init();
#endif //CONFIG_ENCODERS #endif //CONFIG_ENCODERS
dv_init();
ff_dv_init();
fourxm_init(); fourxm_init();
#ifdef CONFIG_ENCODERS #ifdef CONFIG_ENCODERS
flvenc_init(); flvenc_init();


+ 2
- 2
libavformat/avformat.h View File

@@ -425,7 +425,7 @@ int au_init(void);
int amr_init(void); int amr_init(void);


/* wav.c */ /* wav.c */
int wav_init(void);
int ff_wav_init(void);


/* raw.c */ /* raw.c */
int pcm_read_seek(AVFormatContext *s, int pcm_read_seek(AVFormatContext *s,
@@ -442,7 +442,7 @@ int yuv4mpeg_init(void);
int ogg_init(void); int ogg_init(void);


/* dv.c */ /* dv.c */
int dv_init(void);
int ff_dv_init(void);


/* ffm.c */ /* ffm.c */
int ffm_init(void); int ffm_init(void);


+ 1
- 1
libavformat/dv.c View File

@@ -908,7 +908,7 @@ static AVOutputFormat dv_oformat = {
dv_write_trailer, dv_write_trailer,
}; };


int dv_init(void)
int ff_dv_init(void)
{ {
av_register_input_format(&dv_iformat); av_register_input_format(&dv_iformat);
av_register_output_format(&dv_oformat); av_register_output_format(&dv_oformat);


+ 1
- 1
libavformat/wav.c View File

@@ -376,7 +376,7 @@ static AVOutputFormat wav_oformat = {
}; };
#endif //CONFIG_ENCODERS #endif //CONFIG_ENCODERS


int wav_init(void)
int ff_wav_init(void)
{ {
av_register_input_format(&wav_iformat); av_register_input_format(&wav_iformat);
#ifdef CONFIG_ENCODERS #ifdef CONFIG_ENCODERS


Loading…
Cancel
Save