move ffmpeg stuff to gst-ffmpeg module

Original commit message from CVS:
move ffmpeg stuff to gst-ffmpeg module

9 files changed, 8 insertions, 502 deletions

diff --git a/ChangeLog b/ChangeLog
index 9c34ce106..5c17470a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-02-13  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* configure.ac:
+	* ext/Makefile.am:
+	* gst-libs/ext/Makefile.am:
+
+2004-02-13  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* configure.ac: use GST_ARCH to detect architecture
 
 2004-02-12  Julien MOUTTE  <julien@moutte.net>
diff --git a/configure.ac b/configure.ac
index 220a84992..0989d99de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -876,24 +876,6 @@ GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flacenc flacdec, [
   AC_SUBST(FLAC_LIBS)
 ])
 
-dnl *** FFMPEG ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_FFMPEG, true)
-GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [
-  # only slurp in the case where we are in CVS mode;
-  # prerelease and release should get it disted
-  if test "x$GST_PLUGINS_VERSION_NANO" = x1; then
-    AC_MSG_NOTICE(slurping FFmpeg CVS source)
-    AS_SLURP_FFMPEG(gst-libs/ext/ffmpeg, 2003-10-26 10:00 GMT,
-                    HAVE_FFMPEG=yes, HAVE_FFMPEG=no)
-  else
-    AC_MSG_NOTICE(FFmpeg CVS code should be included already)
-    HAVE_FFMPEG=yes
-  fi
-  # we only bother with uninstalled (included) ffmpeg for now
-  AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, 1,
-                     [defined if we use uninstalled ffmpeg])
-])
-
 dnl *** GDK pixbuf ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_GDK_PIXBUF, true)
 GST_CHECK_FEATURE(GDK_PIXBUF, [GDK pixbuf], gdkpixbufsrc, [
@@ -1513,9 +1495,6 @@ AC_SUBST(GST_CFLAGS)
 dnl ###########################
 dnl # Configure external libs #
 dnl ###########################
-if test "x$HAVE_FFMPEG" = xyes; then
-  AC_CONFIG_SUBDIRS(gst-libs/ext/ffmpeg/ffmpeg)
-fi 
 
 dnl ############################
 dnl # Set up some more defines #
@@ -1656,7 +1635,6 @@ ext/dvdnav/Makefile
 ext/esd/Makefile
 ext/faac/Makefile
 ext/faad/Makefile
-ext/ffmpeg/Makefile
 ext/flac/Makefile
 ext/gdk_pixbuf/Makefile
 ext/gnomevfs/Makefile
@@ -1717,7 +1695,6 @@ gst-libs/gst/video/Makefile
 gst-libs/gst/xoverlay/Makefile
 gst-libs/gst/xwindowlistener/Makefile
 gst-libs/ext/Makefile
-gst-libs/ext/ffmpeg/Makefile
 examples/dynparams/Makefile
 examples/capsfilter/Makefile
 examples/seeking/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 182ac56a7..8bb401dd3 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -94,12 +94,6 @@ endif
 ## FESTIVAL_DIR=
 ## endif
 
-if USE_FFMPEG
-FFMPEG_DIR=ffmpeg
-else
-FFMPEG_DIR=
-endif
-
 if USE_FLAC
 FLAC_DIR=flac
 else
@@ -337,7 +331,6 @@ SUBDIRS=\
 	$(NAS_DIR) \
 	$(FAAC_DIR) \
 	$(FAAD_DIR) \
-	$(FFMPEG_DIR) \
 	$(FLAC_DIR) \
 	$(GDK_PIXBUF_DIR) \
 	$(GNOMEVFS_DIR) \
@@ -392,7 +385,6 @@ DIST_SUBDIRS=\
 	esd \
 	faac \
 	faad \
-	ffmpeg \
 	flac \
 	gdk_pixbuf \
 	gnomevfs \
diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am
index c2c937395..f9beb01ec 100644
--- a/gst-libs/ext/Makefile.am
+++ b/gst-libs/ext/Makefile.am
@@ -1,9 +1,2 @@
-if USE_FFMPEG
-FFMPEG_DIR=ffmpeg
-else
-FFMPEG_DIR=
-endif
-
-SUBDIRS = $(FFMPEG_DIR)
-
-DIST_SUBDIRS= ffmpeg
+SUBDIRS =
+DIST_SUBDIRS =
diff --git a/gst-libs/ext/ffmpeg/.gitignore b/gst-libs/ext/ffmpeg/.gitignore
deleted file mode 100644
index 20645e641..000000000
--- a/gst-libs/ext/ffmpeg/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-ffmpeg
diff --git a/gst-libs/ext/ffmpeg/Makefile.am b/gst-libs/ext/ffmpeg/Makefile.am
deleted file mode 100644
index eaa23fcbc..000000000
--- a/gst-libs/ext/ffmpeg/Makefile.am
+++ /dev/null
@@ -1,319 +0,0 @@
-# this doesn't trigger the distdir target in the ffmpeg checkout
-DIST_SUBDIR=
-
-if USE_FFMPEG
-FFMPEG_DIR=ffmpeg
-else
-FFMPEG_DIR=
-endif
-
-MAKEFLAGS=-j1
-
-# patch it up before descending into dirs
-all-recursive: patches
-
-# ignore failures on patching
-# ignore failures on rm
-PATCHES = patch/function.patch
-
-patches:
-	@echo -n Patching ffmpeg if necessary ...
-	@patch -p0 -N -r rejects <$(srcdir)/patch/function.patch > /dev/null || true
-	@rm -f rejects || true
-	@echo done.
-
-
-SUBDIRS =
-
-
-checkout:
-	cvs -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co ffmpeg
-
-# on running make install, make sure make has been run first
-install: all
-	@true
-
-# we don't install stuff so no need to uninstall
-uninstall:
-	@true
-
-
-
-noinst_LTLIBRARIES = libavformat.la libavcodec.la
-
-if HAVE_CPU_I386
-defs_i386 = -DARCH_X86=1 -DHAVE_MMX=1
-else
-defs_i386 =
-endif
-
-if HAVE_CPU_PPC
-defs_powerpc = -DARCH_PPC=1
-else
-defs_powerpc = 
-endif
-
-defs = \
- $(defs_i386) \
- $(defs_powerpc) \
- -DTUNECPU=generic \
- -DHAVE_STRPTIME=1 \
- -DHAVE_LRINTF=1 \
- -DCONFIG_ENCODERS=1 \
- -DCONFIG_DECODERS=1 \
- -DCONFIG_PP=1 \
- -DCONFIG_MPEGAUDIO_HP=1 \
- -DCONFIG_HAVE_DLOPEN=1 \
- -DCONFIG_HAVE_DLFCN=1 \
- -DHAVE_MALLOC_H=1 \
- -DHAVE_MEMALIGN=1 \
- -DSIMPLE_IDCT=1 \
- -DCONFIG_RISKY=1
-
-libavformat_la_SOURCES = \
-	ffmpeg/libavformat/4xm.c \
-	ffmpeg/libavformat/allformats.c \
-	ffmpeg/libavformat/amr.c \
-	ffmpeg/libavformat/asf.c \
-	ffmpeg/libavformat/au.c \
-	ffmpeg/libavformat/audio.c \
-	ffmpeg/libavformat/avidec.c \
-	ffmpeg/libavformat/avienc.c \
-	ffmpeg/libavformat/aviobuf.c \
-	ffmpeg/libavformat/avio.c \
-	ffmpeg/libavformat/crc.c \
-	ffmpeg/libavformat/cutils.c \
-	ffmpeg/libavformat/dv1394.c \
-	ffmpeg/libavformat/dv.c \
-	ffmpeg/libavformat/ffm.c \
-	ffmpeg/libavformat/file.c \
-	ffmpeg/libavformat/flvdec.c \
-	ffmpeg/libavformat/flvenc.c \
-	ffmpeg/libavformat/framehook.c \
-	ffmpeg/libavformat/gif.c \
-	ffmpeg/libavformat/gifdec.c \
-	ffmpeg/libavformat/grab.c \
-	ffmpeg/libavformat/idcin.c \
-	ffmpeg/libavformat/idroq.c \
-	ffmpeg/libavformat/img.c \
-	ffmpeg/libavformat/ipmovie.c \
-	ffmpeg/libavformat/jpeg.c \
-	ffmpeg/libavformat/mov.c \
-	ffmpeg/libavformat/movenc.c \
-	ffmpeg/libavformat/mp3.c \
-	ffmpeg/libavformat/mpeg.c \
-	ffmpeg/libavformat/mpegts.c \
-	ffmpeg/libavformat/mpegtsenc.c \
-	ffmpeg/libavformat/mpjpeg.c \
-	ffmpeg/libavformat/nut.c \
-	ffmpeg/libavformat/os_support.c \
-	ffmpeg/libavformat/png.c \
-	ffmpeg/libavformat/pnm.c \
-	ffmpeg/libavformat/psxstr.c \
-	ffmpeg/libavformat/raw.c \
-	ffmpeg/libavformat/rm.c \
-	ffmpeg/libavformat/segafilm.c \
-	ffmpeg/libavformat/swf.c \
-	ffmpeg/libavformat/utils.c \
-	ffmpeg/libavformat/wav.c \
-	ffmpeg/libavformat/wc3movie.c \
-	ffmpeg/libavformat/westwood.c \
-	ffmpeg/libavformat/yuv4mpeg.c \
-	ffmpeg/libavformat/yuv.c
-
-libavformat_la_LDFLAGS = -lm -lz
-libavformat_la_CFLAGS = $(defs) -Wall -I$(srcdir) -I$(srcdir)/ffmpeg \
-	-I$(srcdir)/ffmpeg/libavformat -I$(srcdir)/ffmpeg/libavcodec \
-	-I$(top_srcdir)/gst-libs/ext/linux/ -DHAVE_AV_CONFIG_H \
-	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-
-files_i386 = \
-	ffmpeg/libavcodec/i386/cputest.c \
-	ffmpeg/libavcodec/i386/dsputil_mmx.c \
-	ffmpeg/libavcodec/i386/fdct_mmx.c \
-	ffmpeg/libavcodec/i386/fft_sse.c \
-	ffmpeg/libavcodec/i386/idct_mmx.c \
-	ffmpeg/libavcodec/i386/motion_est_mmx.c \
-	ffmpeg/libavcodec/i386/mpegvideo_mmx.c \
-	ffmpeg/libavcodec/i386/simple_idct_mmx.c
-if HAVE_CPU_I386
-sources_i386 = $(files_i386)
-else
-sources_i386 = 
-endif
-
-files_powerpc = \
-	ffmpeg/libavcodec/ppc/dsputil_ppc.c \
-	ffmpeg/libavcodec/ppc/mpegvideo_ppc.c
-# disabled Altivec support for now until someone shows up that make them compile conditionally
-#	ffmpeg/libavcodec/ppc/dsputil_altivec.c \
-#	ffmpeg/libavcodec/ppc/fft_altivec.c \
-#	ffmpeg/libavcodec/ppc/gmc_altivec.c \
-#	ffmpeg/libavcodec/ppc/idct_altivec.c \
-#	ffmpeg/libavcodec/ppc/mpegvideo_altivec.c
-if HAVE_CPU_PPC
-sources_powerpc = $(files_powerpc)
-else
-sources_powerpc =
-endif
-
-libavcodec_la_DEFS = $(defs)
-libavcodec_la_CFLAGS = $(defs) -Wall -I$(srcdir)/ffmpeg -I$(srcdir)/ffmpeg/libavformat \
-	-I$(srcdir)/ffmpeg/libavcodec -DHAVE_AV_CONFIG_H \
-	-I$(srcdir)/ffmpeg/libavcodec/liba52 \
-	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-libavcodec_la_LDFLAGS = -lm -lz
-libavcodec_la_SOURCES = \
-	ffmpeg/libavcodec/4xm.c \
-	ffmpeg/libavcodec/ac3enc.c \
-	ffmpeg/libavcodec/adpcm.c \
-	ffmpeg/libavcodec/adx.c \
-	ffmpeg/libavcodec/allcodecs.c \
-	ffmpeg/libavcodec/apiexample.c \
-	ffmpeg/libavcodec/asv1.c \
-	ffmpeg/libavcodec/avcodec.c \
-	ffmpeg/libavcodec/cabac.c \
-	ffmpeg/libavcodec/cinepak.c \
-	ffmpeg/libavcodec/cljr.c \
-	ffmpeg/libavcodec/common.c \
-	ffmpeg/libavcodec/cyuv.c \
-	ffmpeg/libavcodec/dpcm.c \
-	ffmpeg/libavcodec/dsputil.c \
-	ffmpeg/libavcodec/dv.c \
-	ffmpeg/libavcodec/error_resilience.c \
-	ffmpeg/libavcodec/eval.c \
-	ffmpeg/libavcodec/faandct.c \
-	ffmpeg/libavcodec/fdctref.c \
-	ffmpeg/libavcodec/fft.c \
-	ffmpeg/libavcodec/ffv1.c \
-	ffmpeg/libavcodec/golomb.c \
-	ffmpeg/libavcodec/h263.c \
-	ffmpeg/libavcodec/h263dec.c \
-	ffmpeg/libavcodec/h264.c \
-	ffmpeg/libavcodec/huffyuv.c \
-	ffmpeg/libavcodec/idcinvideo.c \
-	ffmpeg/libavcodec/imgconvert.c \
-	ffmpeg/libavcodec/imgresample.c \
-	ffmpeg/libavcodec/indeo3.c \
-	ffmpeg/libavcodec/interplayvideo.c \
-	ffmpeg/libavcodec/jfdctfst.c \
-	ffmpeg/libavcodec/jfdctint.c \
-	ffmpeg/libavcodec/jrevdct.c \
-	ffmpeg/libavcodec/mace.c \
-	ffmpeg/libavcodec/mdct.c \
-	ffmpeg/libavcodec/mem.c \
-	ffmpeg/libavcodec/mjpeg.c \
-	ffmpeg/libavcodec/motion_est.c \
-	ffmpeg/libavcodec/mpeg12.c \
-	ffmpeg/libavcodec/mpegaudio.c \
-	ffmpeg/libavcodec/mpegaudiodec.c \
-	ffmpeg/libavcodec/mpegvideo.c \
-	ffmpeg/libavcodec/msmpeg4.c \
-	ffmpeg/libavcodec/msrle.c \
-	ffmpeg/libavcodec/msvideo1.c \
-	ffmpeg/libavcodec/opts.c \
-	ffmpeg/libavcodec/pcm.c \
-	ffmpeg/libavcodec/ra144.c \
-	ffmpeg/libavcodec/ra288.c \
-	ffmpeg/libavcodec/ratecontrol.c \
-	ffmpeg/libavcodec/rational.c \
-	ffmpeg/libavcodec/raw.c \
-	ffmpeg/libavcodec/resample.c \
-	ffmpeg/libavcodec/roqvideo.c \
-	ffmpeg/libavcodec/rpza.c \
-	ffmpeg/libavcodec/rv10.c \
-	ffmpeg/libavcodec/simple_idct.c \
-	ffmpeg/libavcodec/svq1.c \
-	ffmpeg/libavcodec/utils.c \
-	ffmpeg/libavcodec/vcr1.c \
-	ffmpeg/libavcodec/vp3.c \
-	ffmpeg/libavcodec/vqavideo.c \
-	ffmpeg/libavcodec/wmadec.c \
-	ffmpeg/libavcodec/xan.c \
-	ffmpeg/libavcodec/xvmcvideo.c \
-	$(sources_i386) \
-	$(sources_powerpc)
-
-more_libavcodec_files = \
-	ffmpeg/libavcodec/mdec.c \
-	ffmpeg/libavcodec/motion_est_template.c \
-	ffmpeg/libavcodec/svq3.c \
-	ffmpeg/libavcodec/wmv2.c 
-
-
-all_headers = \
-	ffmpeg/berrno.h \
-	ffmpeg/cmdutils.h \
-	ffmpeg/cygwin_inttypes.h \
-	ffmpeg/ffserver.h \
-	ffmpeg/xvmc_render.h \
-	ffmpeg/libavcodec/ac3.h \
-	ffmpeg/libavcodec/ac3tab.h \
-	ffmpeg/libavcodec/avcodec.h \
-	ffmpeg/libavcodec/bswap.h \
-	ffmpeg/libavcodec/cabac.h \
-	ffmpeg/libavcodec/common.h \
-	ffmpeg/libavcodec/dsputil.h \
-	ffmpeg/libavcodec/dvdata.h \
-	ffmpeg/libavcodec/faandct.h \
-	ffmpeg/libavcodec/fastmemcpy.h \
-	ffmpeg/libavcodec/golomb.h \
-	ffmpeg/libavcodec/h263data.h \
-	ffmpeg/libavcodec/h264data.h \
-	ffmpeg/libavcodec/imgconvert_template.h \
-	ffmpeg/libavcodec/indeo3data.h \
-	ffmpeg/libavcodec/mpeg12data.h \
-	ffmpeg/libavcodec/mpeg4data.h \
-	ffmpeg/libavcodec/mpegaudio.h \
-	ffmpeg/libavcodec/mpegaudiodectab.h \
-	ffmpeg/libavcodec/mpegaudiotab.h \
-	ffmpeg/libavcodec/mpegvideo.h \
-	ffmpeg/libavcodec/msmpeg4data.h \
-	ffmpeg/libavcodec/oggvorbis.h \
-	ffmpeg/libavcodec/ra144.h \
-	ffmpeg/libavcodec/ra288.h \
-	ffmpeg/libavcodec/rational.h \
-	ffmpeg/libavcodec/simple_idct.h \
-	ffmpeg/libavcodec/sp5x.h \
-	ffmpeg/libavcodec/svq1_cb.h \
-	ffmpeg/libavcodec/svq1_vlc.h \
-	ffmpeg/libavcodec/vp3data.h \
-	ffmpeg/libavcodec/wmadata.h \
-	ffmpeg/libavcodec/i386/dsputil_mmx_avg.h \
-	ffmpeg/libavcodec/i386/dsputil_mmx_rnd.h \
-	ffmpeg/libavcodec/i386/mmx.h \
-	ffmpeg/libavcodec/ppc/dsputil_altivec.h \
-	ffmpeg/libavcodec/ppc/dsputil_ppc.h \
-	ffmpeg/libavcodec/ppc/gcc_fixes.h \
-	ffmpeg/libavformat/avformat.h \
-	ffmpeg/libavformat/avi.h \
-	ffmpeg/libavformat/avio.h \
-	ffmpeg/libavformat/barpainet.h \
-	ffmpeg/libavformat/dv.h \
-	ffmpeg/libavformat/dv1394.h \
-	ffmpeg/libavformat/framehook.h \
-	ffmpeg/libavformat/mpegts.h \
-	ffmpeg/libavformat/os_support.h \
-	ffmpeg/libavformat/rtp.h \
-	ffmpeg/libavformat/rtsp.h \
-	ffmpeg/libavformat/rtspcodes.h 
-
-DISTCLEANFILES = \
-	ffmpeg/config.h \
-	ffmpeg/config.mak 
-
-EXTRA_DIST = \
-	$(PATCHES) \
-	Tag \
-	ffmpeg/CREDITS \
-	ffmpeg/INSTALL \
-	ffmpeg/README \
-	ffmpeg/configure \
-	ffmpeg/ffmpeg.c \
-	ffmpeg/ffserver.c \
-	$(libavcodec_la_SOURCES) \
-	$(more_libavcodec_files) \
-	$(libavformat_la_SOURCES) \
-	$(files_i386) \
-	$(files_powerpc) \
-	$(all_headers) 
diff --git a/gst-libs/ext/ffmpeg/README b/gst-libs/ext/ffmpeg/README
deleted file mode 100644
index db788bd3f..000000000
--- a/gst-libs/ext/ffmpeg/README
+++ /dev/null
@@ -1,10 +0,0 @@
-HOWTO sync to a new ffmpeg CVS date:
-
-a) manually update with cvs update -D 'new date tag'
-b) fix stuff so that our plug-in builds against it
-c) in configure.ac, replace the date tag with your new tag
-d) copy gst-libs/ext/ffmpeg/ffmpeg/CVS/Tag to gst-libs/ext/ffmpeg/Tag
-e) commit all these changes to cvs
-
-The reason both c) and d) need to be done is because cvs doesn't understand
-it's own Tag file format as a date spec.
diff --git a/gst-libs/ext/ffmpeg/Tag b/gst-libs/ext/ffmpeg/Tag
deleted file mode 100644
index f6ecaeb31..000000000
--- a/gst-libs/ext/ffmpeg/Tag
+++ /dev/null
@@ -1 +0,0 @@
-2003-10-26 10:00 GMT
diff --git a/gst-libs/ext/ffmpeg/patch/function.patch b/gst-libs/ext/ffmpeg/patch/function.patch
deleted file mode 100644
index 96aebe50e..000000000
--- a/gst-libs/ext/ffmpeg/patch/function.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-Index: ffmpeg/libavcodec/i386/mpegvideo_mmx.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/mpegvideo_mmx.c,v
-retrieving revision 1.25
-diff -u -u -r1.25 mpegvideo_mmx.c
---- ffmpeg/libavcodec/i386/mpegvideo_mmx.c	14 May 2003 15:12:13 -0000	1.25
-+++ ffmpeg/libavcodec/i386/mpegvideo_mmx.c	11 Sep 2003 19:34:45 -0000
-@@ -488,6 +488,7 @@
-     }
- }
- 
-+#if 0
- #undef HAVE_MMX2
- #define RENAME(a) a ## _MMX
- #include "mpegvideo_mmx_template.c"
-@@ -496,6 +497,7 @@
- #undef RENAME
- #define RENAME(a) a ## _MMX2
- #include "mpegvideo_mmx_template.c"
-+#endif
- 
- void MPV_common_init_mmx(MpegEncContext *s)
- {
-@@ -508,6 +510,7 @@
- 
-         draw_edges = draw_edges_mmx;
- 
-+#if 0
-         if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX){
-             if(mm_flags & MM_MMXEXT){
-                 s->dct_quantize= dct_quantize_MMX2;
-@@ -515,5 +518,6 @@
-                 s->dct_quantize= dct_quantize_MMX;
-             }
-         }
-+#endif
-     }
- }
-Index: ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c,v
-retrieving revision 1.17
-diff -u -u -r1.17 mpegvideo_mmx_template.c
---- ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c	13 May 2003 08:21:35 -0000	1.17
-+++ ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c	11 Sep 2003 19:34:47 -0000
-@@ -122,7 +122,7 @@
-             "movd %%mm3, %%eax			\n\t"
-             "movzbl %%al, %%eax			\n\t" // last_non_zero_p1
- 	    : "+a" (last_non_zero_p1)
--            : "r" (block+64), "r" (qmat), "r" (bias),
-+            : "b" (block+64), "r" (qmat), "r" (bias),
-               "r" (inv_zigzag_direct16+64), "r" (temp_block+64)
-         );
-         // note the asm is split cuz gcc doesnt like that many operands ...
-Index: ffmpeg/libavformat/avformat.h
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avformat.h,v
-retrieving revision 1.55
-diff -u -u -r1.55 avformat.h
---- ffmpeg/libavformat/avformat.h	4 Jul 2003 23:48:20 -0000	1.55
-+++ ffmpeg/libavformat/avformat.h	11 Sep 2003 19:34:48 -0000
-@@ -317,7 +317,7 @@
- int amr_init(void);
- 
- /* wav.c */
--int wav_init(void);
-+int avf_wav_init(void);
- 
- /* raw.c */
- int raw_init(void);
-@@ -326,7 +326,7 @@
- int ogg_init(void);
- 
- /* dv.c */
--int dv_init(void);
-+int avf_dv_init(void);
- 
- /* ffm.c */
- int ffm_init(void);
-Index: ffmpeg/libavformat/dv.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/dv.c,v
-retrieving revision 1.9
-diff -u -u -r1.9 dv.c
---- ffmpeg/libavformat/dv.c	23 Apr 2003 02:04:40 -0000	1.9
-+++ ffmpeg/libavformat/dv.c	11 Sep 2003 19:34:48 -0000
-@@ -138,7 +138,7 @@
-     dv_write_trailer,
- };
- 
--int dv_init(void)
-+int avf_dv_init(void)
- {
-     av_register_input_format(&dv_iformat);
-     av_register_output_format(&dv_oformat);
-Index: ffmpeg/libavformat/wav.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/wav.c,v
-retrieving revision 1.23
-diff -u -u -r1.23 wav.c
---- ffmpeg/libavformat/wav.c	12 Mar 2003 18:45:50 -0000	1.23
-+++ ffmpeg/libavformat/wav.c	11 Sep 2003 19:34:52 -0000
-@@ -334,7 +334,7 @@
-     wav_write_trailer,
- };
- 
--int wav_init(void)
-+int avf_wav_init(void)
- {
-     av_register_input_format(&wav_iformat);
-     av_register_output_format(&wav_oformat);
---- ffmpeg/libavformat/allformats.c	2003-10-26 12:06:32.000000000 +0100
-+++ ffmpeg/libavformat/allformats.c	2003-10-26 12:06:04.000000000 +0100
-@@ -45,7 +45,7 @@
-     avienc_init();
- #endif //CONFIG_ENCODERS
-     avidec_init();
--    wav_init();
-+    avf_wav_init();
-     swf_init();
-     au_init();
- #ifdef CONFIG_ENCODERS
-@@ -56,7 +56,7 @@
-     movenc_init();
-     jpeg_init();
- #endif //CONFIG_ENCODERS
--    dv_init();
-+    avf_dv_init();
-     fourxm_init();
- #ifdef CONFIG_ENCODERS
-     flvenc_init();