aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/wav.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2004-03-13 23:04:37 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-03-13 23:04:37 +0000
commitc3775e542f8fda9eeda31cce1d588d70c2fcd56b (patch)
tree9b0d1d916c5aa263a6d2e99f792159fbeb0c7109 /libavformat/wav.c
parent8be014e027f9c023a45a707c2d77de8d0e5ba79d (diff)
downloadandroid_external_ffmpeg-c3775e542f8fda9eeda31cce1d588d70c2fcd56b.tar.gz
android_external_ffmpeg-c3775e542f8fda9eeda31cce1d588d70c2fcd56b.tar.bz2
android_external_ffmpeg-c3775e542f8fda9eeda31cce1d588d70c2fcd56b.zip
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/wav.c')
-rw-r--r--libavformat/wav.c2
1 files changed, 1 insertions, 1 deletions
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