Remove FFmpeg from build system.

3 files changed, 1 insertions, 917 deletions

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 728221159..13387d18d 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -16,155 +16,4 @@ endif
 
 srcdir = $(shell cd @srcdir@; pwd)
 
-ffmpeg_builder = $(srcdir)/ffmpeg-universal.sh
-
-if ENABLE_DXR3
-dxr3encoder = --enable-encoder=mpeg1video
-endif
-
-if FFMPEG_DISABLE_UNCOMMON_CODECS
-disable_uncommon_codecs = \
-	--disable-decoder=aasc --disable-decoder=asv1 --disable-decoder=asv2 --disable-decoder=avs \
-	--disable-decoder=cscd --disable-decoder=cyuv --disable-decoder=dvvideo --disable-decoder=eightbps \
-	--disable-decoder=flic --disable-decoder=flv --disable-decoder=fourxm --disable-decoder=fraps \
-	--disable-decoder=huffyuv --disable-decoder=idcin --disable-decoder=interplay_video --disable-decoder=kmvc \
-	--disable-decoder=loco --disable-decoder=mmvideo --disable-decoder=nuv --disable-decoder=qdraw \
-	--disable-decoder=qpeg --disable-decoder=roq --disable-decoder=rpza --disable-decoder=smacker \
-	--disable-decoder=smc --disable-decoder=snow --disable-decoder=truemotion1 --disable-decoder=truemotion2 \
-	--disable-decoder=tscc --disable-decoder=ulti --disable-decoder=vcr1 --disable-decoder=vmdvideo \
-	--disable-decoder=wnv1 --disable-decoder=xan_wc3 --disable-decoder=xl --disable-decoder=zmbv \
-	--disable-decoder=alac --disable-decoder=amr_nb --disable-decoder=amr_wb --disable-decoder=libgsm \
-	--disable-decoder=mace3 --disable-decoder=mace6 --disable-decoder=shorten --disable-decoder=smackaud \
-	--disable-decoder=truespeech --disable-decoder=tta --disable-decoder=vmdaudio --disable-decoder=pcm_alaw \
-	--disable-decoder=pcm_mulaw --disable-decoder=pcm_s8 --disable-decoder=pcm_s16be --disable-decoder=pcm_s16le \
-	--disable-decoder=pcm_s24be --disable-decoder=pcm_s24daud --disable-decoder=pcm_s24le --disable-decoder=pcm_s32be \
-	--disable-decoder=pcm_s32le --disable-decoder=pcm_u8 --disable-decoder=pcm_u16be --disable-decoder=pcm_u16le \
-	--disable-decoder=pcm_u24be --disable-decoder=pcm_u24le --disable-decoder=pcm_u32be --disable-decoder=pcm_u32le \
-	--disable-decoder=interplay_dpcm --disable-decoder=roq_dpcm --disable-decoder=sol_dpcm --disable-decoder=vqa \
-	--disable-decoder=xan_dpcm --disable-decoder=adpcm_4xm --disable-decoder=adpcm_ct --disable-decoder=adpcm_ea \
-	--disable-decoder=adpcm_ima_dk3 --disable-decoder=adpcm_ima_dk4 --disable-decoder=adpcm_ima_qt \
-	--disable-decoder=adpcm_ima_smjpeg --disable-decoder=adpcm_ima_wav --disable-decoder=adpcm_ima_ws \
-	--disable-decoder=adpcm_ms --disable-decoder=adpcm_sbpro_2 --disable-decoder=adpcm_sbpro_3 \
-	--disable-decoder=adpcm_sbpro_4 --disable-decoder=adpcm_xa --disable-decoder=adpcm_yamaha
-endif
-
-if FFMPEG_DISABLE_POPULAR_CODECS
-disable_popular_codecs = \
-	--disable-decoder=cinepak --disable-decoder=flashsv --disable-decoder=h261 --disable-decoder=h263 \
-	--disable-decoder=h263i --disable-decoder=h264 --disable-decoder=indeo2 --disable-decoder=indeo3 \
-	--disable-decoder=mjpeg --disable-decoder=mjpegb --disable-decoder=mpeg1video --disable-decoder=mpeg2video \
-	--disable-decoder=mpeg4 --disable-decoder=mpegvideo --disable-decoder=msmpeg4v1 --disable-decoder=msmpeg4v2 \
-	--disable-decoder=msmpeg4v3 --disable-decoder=msrle --disable-decoder=msvideo1 --disable-decoder=qtrle \
-	--disable-decoder=rv10 --disable-decoder=rv20 --disable-decoder=svq1 --disable-decoder=svq3 --disable-decoder=vc1 \
-	--disable-decoder=vp3 --disable-decoder=vp5 --disable-decoder=vp6 --disable-decoder=vp6f --disable-decoder=wmv1 \
-	--disable-decoder=wmv2 --disable-decoder=wmv3 --disable-decoder=cook --disable-decoder=dts --disable-decoder=flac \
-	--disable-decoder=mp2 --disable-decoder=mp3 --disable-decoder=qdm2 --disable-decoder=ra_144 --disable-decoder=ra_288 \
-	--disable-decoder=wavpack --disable-decoder=wmav1 --disable-decoder=wmav2 --disable-decoder=adpcm_swf
-endif
-
-configure_options =\
-	--disable-shared --enable-static --disable-demuxers --disable-muxers --disable-strip \
-	--enable-gpl --enable-pthreads --disable-ffmpeg --disable-ffserver --disable-ffplay
-
-# --enable-debug --disable-opts breaks the build of ffmpeg on x86:
-# i386/mpegvideo_mmx_template.c:108: error: can't find a register in class ‘GENERAL_REGS’ while reloading ‘asm’
-# pending a real fix --enable-debug for libxine does not enable debugging options for ffmpeg for now
-#if DEBUG_BUILD
-#configure_options += --enable-debug
-#else
-configure_options += --disable-debug
-#endif
-if PROFILING_BUILD
-configure_options += --enable-gprof
-endif
-if DISABLE_OPTIMIZATIONS
-#configure_options += --disable-opts
-endif
-if HAVE_MLIB
-configure_options += --enable-sunmlib
-endif
-
-if !HOST_OS_DARWIN
-FFMPEG_EXTRA_CFLAGS = -fPIC -DPIC
-endif
-
-disable_decoders = \
-	--disable-decoder=bmp --disable-decoder=cavs --disable-decoder=cljr --disable-decoder=dsicinvideo \
-	--disable-decoder=ffv1 --disable-decoder=ffvhuff --disable-decoder=gif --disable-decoder=mdec \
-	--disable-decoder=mpeg_xvmc --disable-decoder=mszh --disable-decoder=png --disable-decoder=rawvideo \
-	--disable-decoder=sp5x --disable-decoder=targa --disable-decoder=tiertexseqvideo --disable-decoder=tiff \
-	--disable-decoder=vmnc --disable-decoder=zlib --disable-decoder=dsicinaudio --disable-decoder=imc \
-	--disable-decoder=mp3adu --disable-decoder=mp3on4 --disable-decoder=mpc7 --disable-decoder=sonic \
-	--disable-decoder=ws_snd1 --disable-decoder=adpcm_adx --disable-decoder=adpcm_g726 --disable-decoder=dvbsub \
-	--disable-decoder=dvdsub --disable-decoder=theora --disable-decoder=aac --disable-decoder=mpeg4aac \
-	--disable-decoder=ac3 --disable-decoder=vorbis
-
-all_configure_options =	\
-	$(configure_options) --make="$(MAKE)" --cc="$(CC)" \
-	--disable-encoders $(dxr3encoder) $(disable_decoders) \
-	$(disable_uncommon_codecs) $(disable_popular_codecs)
-
-ffmpeg/config.mak: ffmpeg/configure Makefile $(ffmpeg_builder)
-if MACOSX_UNIVERSAL_BINARY
-	export CFLAGS="$(VISIBILITY_FLAG)";							\
-	export FFMPEG_CONFIGURE_OPTIONS="$(all_configure_options)";				\
-	$(ffmpeg_builder) -configure "$(srcdir)/ffmpeg" $(UNIVERSAL_ARCHES)
-else
-	mkdir -p ffmpeg
-	cd ffmpeg; \
-	$(srcdir)/ffmpeg/configure $(all_configure_options) \
-		--extra-cflags="$(VISIBILITY_FLAG) $(FFMPEG_EXTRA_CFLAGS)"; \
-	cd ..
-if HOST_OS_DARWIN
-	cat ffmpeg/config.mak | sed -e '/OPTFLAGS=/s/-mdynamic-no-pic//g' > ffmpeg/config.tmp
-	mv -f ffmpeg/config.tmp ffmpeg/config.mak
-endif
-endif
-
-ffmpeg/libavutil/libavutil.a: ffmpeg/config.mak
-if MACOSX_UNIVERSAL_BINARY
-	export MAKE="$(MAKE)"; \
-	$(ffmpeg_builder) -avutil "$(srcdir)/ffmpeg" $(UNIVERSAL_ARCHES)
-else
-	$(MAKE) -C ffmpeg/libavutil libavutil.a
-endif
-
-ffmpeg/libavcodec/libavcodec.a: ffmpeg/config.mak
-if MACOSX_UNIVERSAL_BINARY
-	export MAKE="$(MAKE)"; \
-	$(ffmpeg_builder) -avcodec "$(srcdir)/ffmpeg" $(UNIVERSAL_ARCHES)
-else
-	$(MAKE) -C ffmpeg/libavcodec libavcodec.a
-endif
-
-ffmpeg/libpostproc/libpostproc.a: ffmpeg/config.mak
-if MACOSX_UNIVERSAL_BINARY
-	export MAKE="$(MAKE)"; \
-	$(ffmpeg_builder) -postproc "$(srcdir)/ffmpeg" $(UNIVERSAL_ARCHES)
-else
-	$(MAKE) -C ffmpeg/libpostproc libpostproc.a
-endif
-
-clean-local:
-if MACOSX_UNIVERSAL_BINARY
-	export MAKE="$(MAKE)"; \
-	$(ffmpeg_builder) -clean "$(srcdir)/ffmpeg" $(UNIVERSAL_ARCHES)
-else
-	-$(MAKE) -C ffmpeg clean
-endif
-
-distclean-local:
-if MACOSX_UNIVERSAL_BINARY
-	export MAKE="$(MAKE)"; \
-	$(ffmpeg_builder) -distclean "$(srcdir)/ffmpeg" $(UNIVERSAL_ARCHES)
-else
-	-$(MAKE) -C ffmpeg distclean
-endif
-
-EXTRA_DIST = README.contrib ffmpeg-distfiles ffmpeg-universal.sh
-
-dist-hook:
-	while read entry; do \
-		test -d $(srcdir)/$$entry && mkdir -p $(distdir)/$$entry; \
-		test -f $(srcdir)/$$entry && cp -p $(srcdir)/$$entry $(distdir)/$$entry; \
-	done < $(srcdir)/ffmpeg-distfiles
+EXTRA_DIST = README.contrib
diff --git a/contrib/ffmpeg-distfiles b/contrib/ffmpeg-distfiles
deleted file mode 100644
index 28735bc3c..000000000
--- a/contrib/ffmpeg-distfiles
+++ /dev/null
@@ -1,588 +0,0 @@
-ffmpeg
-ffmpeg/vhook
-ffmpeg/vhook/imlib2.c
-ffmpeg/vhook/drawtext.c
-ffmpeg/vhook/fish.c
-ffmpeg/vhook/null.c
-ffmpeg/vhook/Makefile
-ffmpeg/vhook/ppm.c
-ffmpeg/vhook/watermark.c
-ffmpeg/libavutil
-ffmpeg/libavutil/lls.h
-ffmpeg/libavutil/mathematics.c
-ffmpeg/libavutil/adler32.h
-ffmpeg/libavutil/x86_cpu.h
-ffmpeg/libavutil/integer.h
-ffmpeg/libavutil/mathematics.h
-ffmpeg/libavutil/crc.c
-ffmpeg/libavutil/avutil.h
-ffmpeg/libavutil/rational.c
-ffmpeg/libavutil/crc.h
-ffmpeg/libavutil/mem.c
-ffmpeg/libavutil/rational.h
-ffmpeg/libavutil/log.c
-ffmpeg/libavutil/internal.h
-ffmpeg/libavutil/bswap.h
-ffmpeg/libavutil/md5.c
-ffmpeg/libavutil/intfloat_readwrite.c
-ffmpeg/libavutil/log.h
-ffmpeg/libavutil/lls.c
-ffmpeg/libavutil/md5.h
-ffmpeg/libavutil/intfloat_readwrite.h
-ffmpeg/libavutil/adler32.c
-ffmpeg/libavutil/Makefile
-ffmpeg/libavutil/integer.c
-ffmpeg/libavutil/common.h
-ffmpeg/libavutil/softfloat.c
-ffmpeg/libavutil/softfloat.h
-ffmpeg/libavutil/fifo.c
-ffmpeg/libavutil/fifo.h
-ffmpeg/libavutil/tree.c
-ffmpeg/libavutil/tree.h
-ffmpeg/libavutil/intreadwrite.h
-ffmpeg/libavutil/aes.c
-ffmpeg/libavutil/aes.h
-ffmpeg/libavutil/lzo.c
-ffmpeg/libavutil/lzo.h
-ffmpeg/libavutil/random.c
-ffmpeg/libavutil/base64.c
-ffmpeg/libavutil/random.h
-ffmpeg/libavutil/base64.h
-ffmpeg/libavutil/sha1.h
-ffmpeg/libavutil/mem.h
-ffmpeg/libavutil/sha1.c
-ffmpeg/libavcodec
-ffmpeg/libavcodec/alpha
-ffmpeg/libavcodec/alpha/regdef.h
-ffmpeg/libavcodec/alpha/simple_idct_alpha.c
-ffmpeg/libavcodec/alpha/mpegvideo_alpha.c
-ffmpeg/libavcodec/alpha/asm.h
-ffmpeg/libavcodec/alpha/motion_est_alpha.c
-ffmpeg/libavcodec/alpha/dsputil_alpha.c
-ffmpeg/libavcodec/alpha/dsputil_alpha_asm.S
-ffmpeg/libavcodec/alpha/motion_est_mvi_asm.S
-ffmpeg/libavcodec/sparc
-ffmpeg/libavcodec/sparc/dsputil_vis.c
-ffmpeg/libavcodec/sparc/vis.h
-ffmpeg/libavcodec/i386
-ffmpeg/libavcodec/i386/idct_mmx_xvid.c
-ffmpeg/libavcodec/i386/mpegvideo_mmx.c
-ffmpeg/libavcodec/i386/vp3dsp_mmx.c
-ffmpeg/libavcodec/i386/motion_est_mmx.c
-ffmpeg/libavcodec/i386/fdct_mmx.c
-ffmpeg/libavcodec/i386/dsputil_h264_template_mmx.c
-ffmpeg/libavcodec/i386/idct_mmx.c
-ffmpeg/libavcodec/i386/fft_3dn2.c
-ffmpeg/libavcodec/i386/dsputil_mmx.c
-ffmpeg/libavcodec/i386/mmx.h
-ffmpeg/libavcodec/i386/dsputil_mmx_avg.h
-ffmpeg/libavcodec/i386/h264dsp_mmx.c
-ffmpeg/libavcodec/i386/vp3dsp_sse2.c
-ffmpeg/libavcodec/i386/dsputil_mmx_rnd.h
-ffmpeg/libavcodec/i386/simple_idct_mmx.c
-ffmpeg/libavcodec/i386/snowdsp_mmx.c
-ffmpeg/libavcodec/i386/fft_3dn.c
-ffmpeg/libavcodec/i386/cputest.c
-ffmpeg/libavcodec/i386/fft_sse.c
-ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c
-ffmpeg/libavcodec/i386/mathops.h
-ffmpeg/libavcodec/i386/cavsdsp_mmx.c
-ffmpeg/libavcodec/ppc
-ffmpeg/libavcodec/ppc/gcc_fixes.h
-ffmpeg/libavcodec/ppc/dsputil_altivec.h
-ffmpeg/libavcodec/ppc/mpegvideo_ppc.c
-ffmpeg/libavcodec/ppc/dsputil_ppc.c
-ffmpeg/libavcodec/ppc/fft_altivec.c
-ffmpeg/libavcodec/ppc/mpegvideo_altivec.c
-ffmpeg/libavcodec/ppc/fdct_altivec.c
-ffmpeg/libavcodec/ppc/idct_altivec.c
-ffmpeg/libavcodec/ppc/dsputil_altivec.c
-ffmpeg/libavcodec/ppc/dsputil_ppc.h
-ffmpeg/libavcodec/ppc/gmc_altivec.c
-ffmpeg/libavcodec/ppc/vc1dsp_altivec.c
-ffmpeg/libavcodec/ppc/float_altivec.c
-ffmpeg/libavcodec/ppc/mathops.h
-ffmpeg/libavcodec/ppc/h264_template_altivec.c
-ffmpeg/libavcodec/ppc/h264_altivec.c
-ffmpeg/libavcodec/ppc/snow_altivec.c
-ffmpeg/libavcodec/ppc/types_altivec.h
-ffmpeg/libavcodec/ps2
-ffmpeg/libavcodec/ps2/mpegvideo_mmi.c
-ffmpeg/libavcodec/ps2/idct_mmi.c
-ffmpeg/libavcodec/ps2/dsputil_mmi.c
-ffmpeg/libavcodec/ps2/mmi.h
-ffmpeg/libavcodec/dcadata.h
-ffmpeg/libavcodec/mlib
-ffmpeg/libavcodec/mlib/dsputil_mlib.c
-ffmpeg/libavcodec/sh4
-ffmpeg/libavcodec/sh4/dsputil_align.c
-ffmpeg/libavcodec/sh4/idct_sh4.c
-ffmpeg/libavcodec/sh4/qpel.c
-ffmpeg/libavcodec/sh4/dsputil_sh4.c
-ffmpeg/libavcodec/armv4l
-ffmpeg/libavcodec/armv4l/mpegvideo_arm.c
-ffmpeg/libavcodec/armv4l/jrevdct_arm.S
-ffmpeg/libavcodec/armv4l/dsputil_iwmmxt_rnd.h
-ffmpeg/libavcodec/armv4l/dsputil_arm.c
-ffmpeg/libavcodec/armv4l/mpegvideo_iwmmxt.c
-ffmpeg/libavcodec/armv4l/dsputil_arm_s.S
-ffmpeg/libavcodec/armv4l/dsputil_iwmmxt.c
-ffmpeg/libavcodec/armv4l/simple_idct_arm.S
-ffmpeg/libavcodec/armv4l/simple_idct_armv5te.S
-ffmpeg/libavcodec/armv4l/mathops.h
-ffmpeg/libavcodec/armv4l/mpegvideo_armv5te.c
-ffmpeg/libavcodec/armv4l/simple_idct_armv6.S
-ffmpeg/libavcodec/mmvideo.c
-ffmpeg/libavcodec/dvbsubdec.c
-ffmpeg/libavcodec/msmpeg4.c
-ffmpeg/libavcodec/mjpeg.c
-ffmpeg/libavcodec/8bps.c
-ffmpeg/libavcodec/ffv1.c
-ffmpeg/libavcodec/adx.c
-ffmpeg/libavcodec/flashsv.c
-ffmpeg/libavcodec/rangecoder.h
-ffmpeg/libavcodec/vp3data.h
-ffmpeg/libavcodec/golomb.c
-ffmpeg/libavcodec/nuv.c
-ffmpeg/libavcodec/h264.c
-ffmpeg/libavcodec/vcr1.c
-ffmpeg/libavcodec/kmvc.c
-ffmpeg/libavcodec/vqavideo.c
-ffmpeg/libavcodec/golomb.h
-ffmpeg/libavcodec/zmbv.c
-ffmpeg/libavcodec/png.c
-ffmpeg/libavcodec/indeo2.c
-ffmpeg/libavcodec/simple_idct.h
-ffmpeg/libavcodec/mpegaudiodectab.h
-ffmpeg/libavcodec/apiexample.c
-ffmpeg/libavcodec/wma.c
-ffmpeg/libavcodec/roqvideo.c
-ffmpeg/libavcodec/jpeg_ls.c
-ffmpeg/libavcodec/mpeg12data.h
-ffmpeg/libavcodec/wmadata.h
-ffmpeg/libavcodec/os2thread.c
-ffmpeg/libavcodec/smacker.c
-ffmpeg/libavcodec/w32thread.c
-ffmpeg/libavcodec/truemotion1data.h
-ffmpeg/libavcodec/Makefile
-ffmpeg/libavcodec/vc1data.h
-ffmpeg/libavcodec/fft-test.c
-ffmpeg/libavcodec/avs.c
-ffmpeg/libavcodec/alac.c
-ffmpeg/libavcodec/cljr.c
-ffmpeg/libavcodec/ac3tab.h
-ffmpeg/libavcodec/cookdata.h
-ffmpeg/libavcodec/faandct.c
-ffmpeg/libavcodec/pnm.c
-ffmpeg/libavcodec/simple_idct.c
-ffmpeg/libavcodec/fft.c
-ffmpeg/libavcodec/bitstream_filter.c
-ffmpeg/libavcodec/oggvorbis.c
-ffmpeg/libavcodec/opt.c
-ffmpeg/libavcodec/flicvideo.c
-ffmpeg/libavcodec/qdm2data.h
-ffmpeg/libavcodec/mpegaudio.c
-ffmpeg/libavcodec/svq1_vlc.h
-ffmpeg/libavcodec/jrevdct.c
-ffmpeg/libavcodec/wma.h
-ffmpeg/libavcodec/cavsdsp.c
-ffmpeg/libavcodec/opt.h
-ffmpeg/libavcodec/allcodecs.c
-ffmpeg/libavcodec/resample.c
-ffmpeg/libavcodec/x264.c
-ffmpeg/libavcodec/vp3.c
-ffmpeg/libavcodec/sp5x.h
-ffmpeg/libavcodec/bmp.h
-ffmpeg/libavcodec/faandct.h
-ffmpeg/libavcodec/dv.c
-ffmpeg/libavcodec/mdec.c
-ffmpeg/libavcodec/sonic.c
-ffmpeg/libavcodec/4xm.c
-ffmpeg/libavcodec/libgsm.c
-ffmpeg/libavcodec/dsputil.h
-ffmpeg/libavcodec/idcinvideo.c
-ffmpeg/libavcodec/avcodec.h
-ffmpeg/libavcodec/qdrw.c
-ffmpeg/libavcodec/error_resilience.c
-ffmpeg/libavcodec/mpegvideo.c
-ffmpeg/libavcodec/faad.c
-ffmpeg/libavcodec/h263data.h
-ffmpeg/libavcodec/lcl.c
-ffmpeg/libavcodec/shorten.c
-ffmpeg/libavcodec/ac3.h
-ffmpeg/libavcodec/xl.c
-ffmpeg/libavcodec/rtjpeg.c
-ffmpeg/libavcodec/mpegvideo.h
-ffmpeg/libavcodec/wmv2.c
-ffmpeg/libavcodec/truemotion1.c
-ffmpeg/libavcodec/imgconvert.c
-ffmpeg/libavcodec/mdct.c
-ffmpeg/libavcodec/h261data.h
-ffmpeg/libavcodec/dvdsubdec.c
-ffmpeg/libavcodec/indeo3data.h
-ffmpeg/libavcodec/rv10.c
-ffmpeg/libavcodec/bytestream.h
-ffmpeg/libavcodec/cabac.c
-ffmpeg/libavcodec/smc.c
-ffmpeg/libavcodec/faac.c
-ffmpeg/libavcodec/xvidff.c
-ffmpeg/libavcodec/mpeg12.c
-ffmpeg/libavcodec/vc1acdata.h
-ffmpeg/libavcodec/cavsdata.h
-ffmpeg/libavcodec/raw.c
-ffmpeg/libavcodec/qpeg.c
-ffmpeg/libavcodec/vc1.c
-ffmpeg/libavcodec/h263dec.c
-ffmpeg/libavcodec/bitstream.c
-ffmpeg/libavcodec/cabac.h
-ffmpeg/libavcodec/interplayvideo.c
-ffmpeg/libavcodec/xvmcvideo.c
-ffmpeg/libavcodec/rtjpeg.h
-ffmpeg/libavcodec/jfdctfst.c
-ffmpeg/libavcodec/cook.c
-ffmpeg/libavcodec/rpza.c
-ffmpeg/libavcodec/utils.c
-ffmpeg/libavcodec/motion_est.c
-ffmpeg/libavcodec/flacenc.c
-ffmpeg/libavcodec/indeo3.c
-ffmpeg/libavcodec/wnv1.c
-ffmpeg/libavcodec/h263.c
-ffmpeg/libavcodec/imgresample.c
-ffmpeg/libavcodec/mpegaudiodec.c
-ffmpeg/libavcodec/parser.c
-ffmpeg/libavcodec/snow.c
-ffmpeg/libavcodec/truespeech_data.h
-ffmpeg/libavcodec/dct-test.c
-ffmpeg/libavcodec/ratecontrol.c
-ffmpeg/libavcodec/tta.c
-ffmpeg/libavcodec/xvid_rc.c
-ffmpeg/libavcodec/svq1.c
-ffmpeg/libavcodec/bitstream.h
-ffmpeg/libavcodec/snow.h
-ffmpeg/libavcodec/a52dec.c
-ffmpeg/libavcodec/cavs.c
-ffmpeg/libavcodec/asv1.c
-ffmpeg/libavcodec/truespeech.c
-ffmpeg/libavcodec/msmpeg4data.h
-ffmpeg/libavcodec/qdm2.c
-ffmpeg/libavcodec/fraps.c
-ffmpeg/libavcodec/svq1_cb.h
-ffmpeg/libavcodec/cscd.c
-ffmpeg/libavcodec/vorbis.c
-ffmpeg/libavcodec/bmp.c
-ffmpeg/libavcodec/dvdata.h
-ffmpeg/libavcodec/mpegaudio.h
-ffmpeg/libavcodec/flac.c
-ffmpeg/libavcodec/amr.c
-ffmpeg/libavcodec/dtsdec.c
-ffmpeg/libavcodec/dsputil.c
-ffmpeg/libavcodec/lzw.c
-ffmpeg/libavcodec/g726.c
-ffmpeg/libavcodec/bfin
-ffmpeg/libavcodec/bfin/dsputil_bfin.c
-ffmpeg/libavcodec/bfin/fdct_bfin.S
-ffmpeg/libavcodec/bfin/idct_bfin.S
-ffmpeg/libavcodec/bfin/pixels_bfin.S
-ffmpeg/libavcodec/bfin/config_bfin.h
-ffmpeg/libavcodec/ulti_cb.h
-ffmpeg/libavcodec/cinepak.c
-ffmpeg/libavcodec/xan.c
-ffmpeg/libavcodec/fdctref.c
-ffmpeg/libavcodec/eval.c
-ffmpeg/libavcodec/vmnc.c
-ffmpeg/libavcodec/qtrle.c
-ffmpeg/libavcodec/rangecoder.c
-ffmpeg/libavcodec/truemotion2.c
-ffmpeg/libavcodec/indeo2data.h
-ffmpeg/libavcodec/pcm.c
-ffmpeg/libavcodec/motion_est_template.c
-ffmpeg/libavcodec/imgconvert_template.h
-ffmpeg/libavcodec/mpegaudiotab.h
-ffmpeg/libavcodec/mp3lameaudio.c
-ffmpeg/libavcodec/h261.c
-ffmpeg/libavcodec/msrle.c
-ffmpeg/libavcodec/dpcm.c
-ffmpeg/libavcodec/cyuv.c
-ffmpeg/libavcodec/pthread.c
-ffmpeg/libavcodec/ra144.c
-ffmpeg/libavcodec/loco.c
-ffmpeg/libavcodec/huffyuv.c
-ffmpeg/libavcodec/svq3.c
-ffmpeg/libavcodec/tscc.c
-ffmpeg/libavcodec/ws-snd1.c
-ffmpeg/libavcodec/ra144.h
-ffmpeg/libavcodec/wmadec.c
-ffmpeg/libavcodec/motion_test.c
-ffmpeg/libavcodec/ra288.c
-ffmpeg/libavcodec/mace.c
-ffmpeg/libavcodec/jfdctint.c
-ffmpeg/libavcodec/aasc.c
-ffmpeg/libavcodec/ra288.h
-ffmpeg/libavcodec/mpeg4data.h
-ffmpeg/libavcodec/dvdsubenc.c
-ffmpeg/libavcodec/ulti.c
-ffmpeg/libavcodec/vmdav.c
-ffmpeg/libavcodec/vp3dsp.c
-ffmpeg/libavcodec/beosthread.c
-ffmpeg/libavcodec/h264data.h
-ffmpeg/libavcodec/adpcm.c
-ffmpeg/libavcodec/dvbsub.c
-ffmpeg/libavcodec/msvideo1.c
-ffmpeg/libavcodec/h264idct.c
-ffmpeg/libavcodec/resample2.c
-ffmpeg/libavcodec/ac3enc.c
-ffmpeg/libavcodec/vp6data.h
-ffmpeg/libavcodec/mathops.h
-ffmpeg/libavcodec/eval.h
-ffmpeg/libavcodec/vp5data.h
-ffmpeg/libavcodec/vp56data.c
-ffmpeg/libavcodec/vp56data.h
-ffmpeg/libavcodec/vp5.c
-ffmpeg/libavcodec/vorbis_enc.c
-ffmpeg/libavcodec/vp56.c
-ffmpeg/libavcodec/ratecontrol.h
-ffmpeg/libavcodec/audioconvert.c
-ffmpeg/libavcodec/vp56.h
-ffmpeg/libavcodec/vorbis.h
-ffmpeg/libavcodec/vorbis_data.c
-ffmpeg/libavcodec/vc1dsp.c
-ffmpeg/libavcodec/vp6.c
-ffmpeg/libavcodec/vorbis_enc_data.h
-ffmpeg/libavcodec/wavpack.c
-ffmpeg/libavcodec/targa.c
-ffmpeg/libavcodec/lzw.h
-ffmpeg/libavcodec/xvid_internal.h
-ffmpeg/libavcodec/imcdata.h
-ffmpeg/libavcodec/tiertexseqv.c
-ffmpeg/libavcodec/imc.c
-ffmpeg/libavcodec/tiff.c
-ffmpeg/libavcodec/dsicinav.c
-ffmpeg/libavcodec/parser.h
-ffmpeg/libavcodec/gif.c
-ffmpeg/libavcodec/gifdec.c
-ffmpeg/libavcodec/mpcdata.h
-ffmpeg/libavcodec/zmbvenc.c
-ffmpeg/libavcodec/h264dsp.c
-ffmpeg/libavcodec/h264enc.c
-ffmpeg/libavcodec/mpc.c
-ffmpeg/libavcodec/flashsvenc.c
-ffmpeg/libavcodec/xvmc_render.h
-ffmpeg/libavcodec/libtheoraenc.c
-ffmpeg/libavcodec/dca.c
-ffmpeg/libavcodec/bmpenc.c
-ffmpeg/libavcodec/dcahuff.h
-ffmpeg/libavcodec/wmaenc.c
-ffmpeg/libavcodec/targaenc.c
-ffmpeg/libavcodec/ac3.c
-ffmpeg/libavcodec/dxa.c
-ffmpeg/libavcodec/rl.h
-ffmpeg/libavcodec/dnxhddec.c
-ffmpeg/libavcodec/dnxhddata.h
-ffmpeg/libavcodec/xiph.c
-ffmpeg/libavcodec/xiph.h
-ffmpeg/libpostproc
-ffmpeg/libpostproc/postprocess_template.c
-ffmpeg/libpostproc/postprocess.c
-ffmpeg/libpostproc/postprocess_internal.h
-ffmpeg/libpostproc/postprocess_altivec_template.c
-ffmpeg/libpostproc/mangle.h
-ffmpeg/libpostproc/postprocess.h
-ffmpeg/libpostproc/Makefile
-ffmpeg/tests
-ffmpeg/tests/videogen.c
-ffmpeg/tests/rotozoom.regression.ref
-ffmpeg/tests/test.conf
-ffmpeg/tests/tiny_psnr.c
-ffmpeg/tests/dsptest.c
-ffmpeg/tests/libav.regression.ref
-ffmpeg/tests/lena.pnm
-ffmpeg/tests/regression.sh
-ffmpeg/tests/rotozoom.c
-ffmpeg/tests/audiogen.c
-ffmpeg/tests/ffserver.regression.ref
-ffmpeg/tests/Makefile
-ffmpeg/tests/server-regression.sh
-ffmpeg/tests/ffmpeg.regression.ref
-ffmpeg/tests/seek_test.sh
-ffmpeg/tests/seek_test.c
-ffmpeg/doc
-ffmpeg/doc/faq.texi
-ffmpeg/doc/ffmpeg-doc.texi
-ffmpeg/doc/optimization.txt
-ffmpeg/doc/TODO
-ffmpeg/doc/ffserver.conf
-ffmpeg/doc/texi2pod.pl
-ffmpeg/doc/ffmpeg_powerpc_performance_evaluation_howto.txt
-ffmpeg/doc/hooks.texi
-ffmpeg/doc/ffplay-doc.texi
-ffmpeg/doc/Makefile
-ffmpeg/doc/ffserver-doc.texi
-ffmpeg/doc/soc.txt
-ffmpeg/doc/snow.txt
-ffmpeg/doc/avutil.txt
-ffmpeg/libavformat
-ffmpeg/libavformat/riff.h
-ffmpeg/libavformat/img2.c
-ffmpeg/libavformat/voc.h
-ffmpeg/libavformat/dv1394.h
-ffmpeg/libavformat/rtsp.h
-ffmpeg/libavformat/utils.c
-ffmpeg/libavformat/wav.c
-ffmpeg/libavformat/cutils.c
-ffmpeg/libavformat/dvenc.c
-ffmpeg/libavformat/nut.c
-ffmpeg/libavformat/avisynth.c
-ffmpeg/libavformat/crc.c
-ffmpeg/libavformat/wv.c
-ffmpeg/libavformat/ipmovie.c
-ffmpeg/libavformat/nut.h
-ffmpeg/libavformat/ffm.c
-ffmpeg/libavformat/mtv.c
-ffmpeg/libavformat/nuv.c
-ffmpeg/libavformat/framehook.c
-ffmpeg/libavformat/os_support.c
-ffmpeg/libavformat/vocenc.c
-ffmpeg/libavformat/idroq.c
-ffmpeg/libavformat/libnut.c
-ffmpeg/libavformat/http.c
-ffmpeg/libavformat/westwood.c
-ffmpeg/libavformat/matroska.c
-ffmpeg/libavformat/vocdec.c
-ffmpeg/libavformat/adtsenc.c
-ffmpeg/libavformat/flic.c
-ffmpeg/libavformat/electronicarts.c
-ffmpeg/libavformat/rtp_h264.c
-ffmpeg/libavformat/mpjpeg.c
-ffmpeg/libavformat/flvenc.c
-ffmpeg/libavformat/os_support.h
-ffmpeg/libavformat/rtp_h264.h
-ffmpeg/libavformat/tiertexseq.c
-ffmpeg/libavformat/gxf.c
-ffmpeg/libavformat/nutdec.c
-ffmpeg/libavformat/avi.h
-ffmpeg/libavformat/network.h
-ffmpeg/libavformat/smacker.c
-ffmpeg/libavformat/flv.h
-ffmpeg/libavformat/udp.c
-ffmpeg/libavformat/x11grab.c
-ffmpeg/libavformat/gxf.h
-ffmpeg/libavformat/mpc.c
-ffmpeg/libavformat/avs.c
-ffmpeg/libavformat/daud.c
-ffmpeg/libavformat/rtpproto.c
-ffmpeg/libavformat/Makefile
-ffmpeg/libavformat/framehook.h
-ffmpeg/libavformat/oggparsevorbis.c
-ffmpeg/libavformat/rtspcodes.h
-ffmpeg/libavformat/oggparseflac.c
-ffmpeg/libavformat/mpegts.c
-ffmpeg/libavformat/mp3.c
-ffmpeg/libavformat/mpegts.h
-ffmpeg/libavformat/rtp.c
-ffmpeg/libavformat/dc1394.c
-ffmpeg/libavformat/4xm.c
-ffmpeg/libavformat/ogg.c
-ffmpeg/libavformat/qtpalette.h
-ffmpeg/libavformat/asf.c
-ffmpeg/libavformat/dv.c
-ffmpeg/libavformat/gxfenc.c
-ffmpeg/libavformat/mmf.c
-ffmpeg/libavformat/beosaudio.cpp
-ffmpeg/libavformat/rtp.h
-ffmpeg/libavformat/grab.c
-ffmpeg/libavformat/asf-enc.c
-ffmpeg/libavformat/asf.h
-ffmpeg/libavformat/dv.h
-ffmpeg/libavformat/rm.c
-ffmpeg/libavformat/file.c
-ffmpeg/libavformat/yuv4mpeg.c
-ffmpeg/libavformat/nsvdec.c
-ffmpeg/libavformat/tcp.c
-ffmpeg/libavformat/movenc.c
-ffmpeg/libavformat/mpeg.c
-ffmpeg/libavformat/raw.c
-ffmpeg/libavformat/amr.c
-ffmpeg/libavformat/sierravmd.c
-ffmpeg/libavformat/gifdec.c
-ffmpeg/libavformat/wc3movie.c
-ffmpeg/libavformat/grab_bktr.c
-ffmpeg/libavformat/sol.c
-ffmpeg/libavformat/avio.c
-ffmpeg/libavformat/ogg2.c
-ffmpeg/libavformat/swf.c
-ffmpeg/libavformat/mov.c
-ffmpeg/libavformat/avio.h
-ffmpeg/libavformat/ogg2.h
-ffmpeg/libavformat/psxstr.c
-ffmpeg/libavformat/avienc.c
-ffmpeg/libavformat/au.c
-ffmpeg/libavformat/aiff.c
-ffmpeg/libavformat/isom.c
-ffmpeg/libavformat/mxf.c
-ffmpeg/libavformat/mm.c
-ffmpeg/libavformat/avformat.h
-ffmpeg/libavformat/oggparseogm.c
-ffmpeg/libavformat/idcin.c
-ffmpeg/libavformat/oggparsetheora.c
-ffmpeg/libavformat/mpegtsenc.c
-ffmpeg/libavformat/riff.c
-ffmpeg/libavformat/segafilm.c
-ffmpeg/libavformat/v4l2.c
-ffmpeg/libavformat/tta.c
-ffmpeg/libavformat/avidec.c
-ffmpeg/libavformat/audio.c
-ffmpeg/libavformat/flvdec.c
-ffmpeg/libavformat/voc.c
-ffmpeg/libavformat/allformats.c
-ffmpeg/libavformat/gif.c
-ffmpeg/libavformat/rtsp.c
-ffmpeg/libavformat/dsicin.c
-ffmpeg/libavformat/dv1394.c
-ffmpeg/libavformat/allformats.h
-ffmpeg/libavformat/aviobuf.c
-ffmpeg/libavformat/isom.h
-ffmpeg/libavformat/rtp_internal.h
-ffmpeg/libavformat/dxa.c
-ffmpeg/libavformat/thp.c
-ffmpeg/configure
-ffmpeg/Doxyfile
-ffmpeg/ffmpeg.c
-ffmpeg/Changelog
-ffmpeg/clean-diff
-ffmpeg/pktdumper.c
-ffmpeg/output_example.c
-ffmpeg/CREDITS
-ffmpeg/version.sh
-ffmpeg/cmdutils.c
-ffmpeg/INSTALL
-ffmpeg/COPYING
-ffmpeg/build_avopt
-ffmpeg/ffinstall.nsi
-ffmpeg/cmdutils.h
-ffmpeg/Makefile
-ffmpeg/qt-faststart.c
-ffmpeg/cws2fws.c
-ffmpeg/unwrap-diff
-ffmpeg/README
-ffmpeg/common.mak
-ffmpeg/ffplay.c
-ffmpeg/ffserver.c
-ffmpeg/ffserver.h
-ffmpeg/MAINTAINERS
-ffmpeg/libswscale
-ffmpeg/libswscale/yuv2rgb.c
-ffmpeg/libswscale/swscale.c
-ffmpeg/libswscale/rgb2rgb_template.c
-ffmpeg/libswscale/swscale_internal.h
-ffmpeg/libswscale/swscale_altivec_template.c
-ffmpeg/libswscale/yuv2rgb_mlib.c
-ffmpeg/libswscale/cs_test.c
-ffmpeg/libswscale/swscale.h
-ffmpeg/libswscale/rgb2rgb.c
-ffmpeg/libswscale/yuv2rgb_altivec.c
-ffmpeg/libswscale/swscale-example.c
-ffmpeg/libswscale/yuv2rgb_template.c
-ffmpeg/libswscale/Makefile
-ffmpeg/libswscale/rgb2rgb.h
-ffmpeg/libswscale/swscale_template.c
-ffmpeg/libswscale/yuv2rgb_init.c
diff --git a/contrib/ffmpeg-universal.sh b/contrib/ffmpeg-universal.sh
deleted file mode 100755
index 6e27c56b8..000000000
--- a/contrib/ffmpeg-universal.sh
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/bin/sh
-
-function usage {
-    echo "usage: $0 <action> <source path> <arch list>"
-    echo "where: <action> is one of:"
-    echo "       -configure    do initial configuration for each architecture"
-    echo "       -avcodec      build libavcodec.a for each architecture"
-    echo "       -avutil       build libavutil.a for each architecture"
-    echo "       -postproc     build libpostproc.a for each architecture"
-    echo "       -clean        clean for each architecture"
-    echo "       -distclean    distclean for each architecture"
-    echo ""
-    echo "Configuration must be done before any library builds.  Options to be passed"
-    echo "to ffmpeg's configure command-line should be passed in the environment"
-    echo "using the FFMPEG_CONFIGURE_OPTIONS environment variable."
-    exit 1
-}
-
-function run_configure {
-    local arch=$1
-    local ffmpeg_topbuilddir="$2"
-
-    # start over from scratch
-    rm -rf "$ffmpeg_topbuilddir"
-    mkdir -p "$ffmpeg_topbuilddir"
-    pushd "$ffmpeg_topbuilddir" > /dev/null 2>&1
-
-    # The Makefile should be passing FFMPEG_CONFIGURE_OPTIONS without passing
-    # any --extra-cflags or --extra-ldflags options.  Both CFLAGS and LDFLAGS
-    # should be in the environment in addition to FFMPEG_CONFIGURE_OPTIONS.
-
-    local CROSS_OPTIONS=
-    local EXTRA_CFLAGS=
-    local EXTRA_LDFLAGS=
-
-    if test $HOST_ARCH != $arch; then
-        EXTRA_CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch $arch"
-        EXTRA_LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch $arch"
-        if test $arch = i386; then
-            FFMPEG_ARCH=x86_32
-        else
-            FFMPEG_ARCH=$arch
-        fi
-        CROSS_OPTIONS="--cross-compile --arch=$FFMPEG_ARCH"
-    fi
-
-    echo "$SOURCE_PATH/configure" $CROSS_OPTIONS $FFMPEG_CONFIGURE_OPTIONS \
-                                  --extra-cflags="$EXTRA_CFLAGS" \
-                                  --extra-ldflags="$EXTRA_LDFLAGS"
-    "$SOURCE_PATH/configure" $CROSS_OPTIONS $FFMPEG_CONFIGURE_OPTIONS \
-                             --extra-cflags="$EXTRA_CFLAGS" \
-                             --extra-ldflags="$EXTRA_LDFLAGS"
-    local retval=$?
-
-    # We're building ffmpeg to put it into a shared library, but ffmpeg thinks
-    # it's building to put it into a static library or program image, so it
-    # adds -mdynamic-no-pic to its list of options as an optimization.  This is
-    # fine in Tiger if later linked with -Wl,-read_only_relocs,warning, but it
-    # isn't fine on other versions of Mac OS X.
-    if test -f config.mak; then
-        cat config.mak | sed -e '/OPTFLAGS=/s/-mdynamic-no-pic//g' > config.tmp
-        mv -f config.tmp config.mak
-    fi
-
-    popd > /dev/null 2>&1
-    `exit $retval` || exit $retval
-}
-
-if test x"$*" = x""; then
-    usage
-fi
-case "$1" in
-    -configure)
-        MODE=configure
-        ;;
-    -avcodec)
-        MODE=avcodec
-        ;;
-    -avutil)
-        MODE=avutil
-        ;;
-    -postproc)
-        MODE=postproc
-        ;;
-    -clean)
-        MODE=clean
-        ;;
-    -distclean)
-        MODE=distclean
-        ;;
-    *)
-        echo "Unrecognized mode: $1"
-        usage
-        ;;
-esac
-shift
-
-if test x"$1" = x""; then
-    echo "No source path specified!"
-    usage
-fi
-if test ! -d "$1"; then
-    echo "Source path $1 does not exist!"
-    exit 1
-fi
-SOURCE_PATH="$1"
-shift
-
-TOP_BUILD_PATH="`pwd`/ffmpeg"
-if test -f "$TOP_BUILD_PATH/configure"; then
-    # Building in place.  Create a temporary build directory and use that
-    # instead, but place the final output from lipo into the original
-    # build directory.
-    BUILD_PATH="$TOP_BUILD_PATH/build"
-else
-    BUILD_PATH="$TOP_BUILD_PATH"
-fi
-# This doesn't make sense for -configure, but it does for everything else.
-# The -configure mode won't ever use it anyway.
-OUTPUT_FILENAME="$BUILD_PATH/lib$MODE/lib$MODE.a"
-
-HOST_ARCH=`arch`
-UNIVERSAL_ARCHES=$*
-if test x"$UNIVERSAL_ARCHES" = x""; then
-    echo "No architecture(s) specified; using $HOST_ARCH only."
-    UNIVERSAL_ARCHES=$HOST_ARCH
-fi
-CONFIG_FILES=
-LIPO_CMDLINE="-create -output $OUTPUT_FILENAME"
-for arch in $UNIVERSAL_ARCHES; do
-    ffmpeg_topbuilddir="$BUILD_PATH/$arch"
-    LIPO_CMDLINE="$LIPO_CMDLINE -arch $arch $ffmpeg_topbuilddir/lib$MODE/lib$MODE.a"
-    case $MODE in
-        configure)
-            run_configure $arch "$ffmpeg_topbuilddir"
-            CONFIG_FILES="$CONFIG_FILES $ffmpeg_topbuilddir/config.h"
-            ;;
-        avcodec)
-            "$MAKE" -C "$ffmpeg_topbuilddir/libavcodec" libavcodec.a || exit $?
-            ;;
-        avutil)
-            "$MAKE" -C "$ffmpeg_topbuilddir/libavutil" libavutil.a || exit $?
-            ;;
-        postproc)
-            "$MAKE" -C "$ffmpeg_topbuilddir/libpostproc" libpostproc.a || exit $?
-            ;;
-        clean)
-            "$MAKE" -C "$ffmpeg_topbuilddir" clean || exit $?
-            ;;
-        distclean)
-            "$MAKE" -C "$ffmpeg_topbuilddir" distclean || exit $?
-            ;;
-    esac
-done
-
-case $MODE in
-    configure)
-        # Now that configuration is done, create config.h in the top-level
-        # ffmpeg directory.  Pull out only what's needed by xine-lib, removing
-        # any possible platform conflicts
-        grep -h "define CONFIG_.*_DECODER" $CONFIG_FILES | uniq > "$BUILD_PATH/config.h"
-        touch "$BUILD_PATH/config.mak"
-        ;;
-    clean)
-        rm -f "$BUILD_PATH/libavcodec/libavcodec.a" "$BUILD_PATH/libavutil/libavutil.a" \
-              "$BUILD_PATH/libpostproc/libpostproc.a"
-        ;;
-    distclean)
-        rm -f "$BUILD_PATH/config.mak" "$BUILD_PATH/config.h"
-        rm -f "$BUILD_PATH/libavcodec/libavcodec.a" "$BUILD_PATH/libavutil/libavutil.a" \
-              "$BUILD_PATH/libpostproc/libpostproc.a"
-        ;;
-    *)
-        mkdir -p "`dirname "$OUTPUT_FILENAME"`"
-        lipo $LIPO_CMDLINE
-        ;;
-esac