Use ffmpeg from current trunk for building AMR support against.

extras/contrib/src/Makefile

@@ -112,7 +112,7 @@ ifdef HAVE_WINCE
 HOSTCONF+= --without-pic --disable-shared
 FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols
 else
-FFMPEGCONF+= --enable-mp3lame --enable-faac
+FFMPEGCONF+= --enable-libmp3lame --enable-libfaac
 endif
 
 ifdef HAVE_BEOS
@@ -128,7 +128,7 @@ endif
 endif
 
 ifdef HAVE_AMR
-FFMPEGCONF+= --enable-libamr_nb --enable-libamr_nb-fixed--enable-libamr_wb
+FFMPEGCONF+= --enable-libamr --enable-libamr-nb --enable-libamr-wb
 endif
 
 # ***************************************************************************
@@ -958,7 +958,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).bz2
 # ***************************************************************************
 
 ffmpeg:
-	$(SVN) co $(FFMPEG_SVN) -r 7407 ffmpeg
+	$(SVN) co $(FFMPEG_SVN) ffmpeg
 ifeq ($(HOST),i586-pc-beos)
 	(cd $@; patch -p 0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
@@ -984,7 +984,7 @@ ifdef HAVE_WINCE
 else
 .ffmpeg: ffmpeg .faac .lame
 endif
-	(cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-network --enable-a52 --disable-ffplay && make install-libs install-headers)
+	(cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-network --enable-liba52 --disable-ffplay && make install-libs install-headers)
 	touch $@
 
 CLEAN_FILE += .ffmpeg