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/allformats.c | |
| 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
Diffstat (limited to 'libavformat/allformats.c')
| -rw-r--r-- | libavformat/allformats.c | 4 |
1 files changed, 2 insertions, 2 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(); |