contribs ffmpeg:

Specifying a revision for ffmpeg has no influence on the libswscale. This will be
the current head of libswscale which might conflict with ffmpeg's HEAD. The
suggested revision to use is 29968, which must be forced by removing libswscale and
checking out: svn co -r 29968 svn://svn.ffmpeg.org/mplayer/trunk/libswscale libswscale

extras/contrib/src/Distributions/davinci.mak

 # Contrib configuration for TI Davinci based SoC
 #
-FFMPEGCONF += --arch=armv5te --enable-armv5te
+FFMPEGCONF += --arch=armv5te --enable-armv5te --cpu=armv5te
 
 FFMPEGCONF += --disable-protocols
 
@@ -10,7 +10,7 @@ FFMPEGCONF += --disable-muxers
 
 FFMPEGCONF += --disable-demuxers --enable-demuxer=gif --enable-demuxer=mjpg \
 		--enable-demuxer=aac --enable-demuxer=ac3 --enable-demuxer=amr --enable-demuxer=daud --enable-demuxer=dts --enable-demuxer=ogg \
-		--enable-demuxer=mp1 --enable-demuxer=mp2 \
+		--enable-demuxer=mp1 --enable-demuxer=mp2 --enable-decoder=libgsm --enable-decoder=libgsm_ms \
 		--enable-demuxer=pcm_alaw  --enable-demuxer=pcm_mulaw \
 		--enable-demuxer=pcm_s16le --enable-demuxer=pcm_s16be --enable-demuxer=pcm_s24be  \
 		--enable-demuxer=pcm_s24le --enable-demuxer=pcm_s32be --enable-demuxer=pcm_s32le --enable-demuxer=pcm_s8 \
@@ -22,7 +22,7 @@ FFMPEGCONF += --disable-parsers \
 
 FFMPEGCONF += --disable-decoders \
 		--enable-decoder=gif --enable-decoder=targa --enable-decoder=tiff --enable-decoder=png --enable-decoder=bmp --enable-decoder=zlib \
-		--enable-decoder=aac --enable-decoder=ac3 --enable-decoder=aasc --enable-decoder=libgsm --enable-decoder=libgsm_ms \
+		--enable-decoder=aac --enable-decoder=ac3 --enable-decoder=aasc \
 		--enable-decoder=pcm_alaw --enable-decoder=pcm_bluray --enable-decoder=pcm_dvd --enable-decoder=pcm_mulaw \
 		--enable-decoder=pcm_s16be --enable-decoder=pcm_s16le --enable-decoder=pcm_s16le_planar --enable-decoder=pcm_s24be \
 		--enable-decoder=pcm_s24daud --enable-decoder=pcm_s24le --enable-decoder=pcm_s32be --enable-decoder=pcm_s32le \

extras/contrib/src/Makefile

@@ -125,6 +125,7 @@ FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders --
 endif
 
 ifdef HAVE_UCLIBC
+FFMPEGCONF+= --target-os=linux
 ifdef HAVE_BIGENDIAN
 FFMPEGCONF+= --arch=armeb --enable-armv5te --enable-iwmmxt
 else  # HAVE UCLIBC
@@ -139,7 +140,8 @@ endif # not HAVE UCLIBC
 
 ifdef HAVE_ARM_LINUX
 #HOSTCONF+=
-#FFMPEGCONF+= --arch=armv4l
+#FFMPEGCONF+= --arch=armv4l --cpu=armv4l
+FFMPEGCONF+= --target-os=linux
 endif
 
 ifdef HAVE_BEOS
@@ -1108,7 +1110,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 
 ifdef SVN
 ffmpeg:
-	$(SVN) co $(FFMPEG_SVN) ffmpeg
+	$(SVN) co -r 20627 $(FFMPEG_SVN) ffmpeg
 ifeq ($(HOST),i586-pc-beos)
 	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif

extras/contrib/src/packages.mak

@@ -28,6 +28,7 @@ PENGUIN=http://ftp.penguin.cz/pub/users/utx/amr
 GNU=ftp://ftp.gnu.org/gnu
 SF=http://heanet.dl.sourceforge.net/sourceforge
 VIDEOLAN=http://downloads.videolan.org/pub/videolan
+CONTRIB_VIDEOLAN=http://downloads.videolan.org/pub/videolan/testing/contrib
 PERL_VERSION=5.8.8
 PERL_URL=http://ftp.funet.fi/pub/CPAN/src/perl-$(PERL_VERSION).tar.gz
 LIBAMR_NB_VERSION=7.0.0.0
@@ -230,3 +231,4 @@ ASS_VERSION=0.9.6
 ASS_URL=$(SF)/libass/libass-$(ASS_VERSION).tar.bz2
 GSM_VERSION=1.0.12
 GSM_URL=http://user.cs.tu-berlin.de/~jutta/gsm/gsm-$(GSM_VERSION).tar.gz
+GSM_URL=$(CONTRIB_VIDEOLAN)/gsm-$(GSM_VERSION).tar.gz