diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2004-03-13 23:04:37 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-03-13 23:04:37 +0000 |
| commit | c3775e542f8fda9eeda31cce1d588d70c2fcd56b (patch) | |
| tree | 9b0d1d916c5aa263a6d2e99f792159fbeb0c7109 /libavformat/avformat.h | |
| parent | 8be014e027f9c023a45a707c2d77de8d0e5ba79d (diff) | |
| download | ffmpeg-c3775e542f8fda9eeda31cce1d588d70c2fcd56b.tar.gz | |
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
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 4 |
1 files changed, 2 insertions, 2 deletions
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); |