From eb9958044b090ce325ef437af07b2580ac804289 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 12 Jul 2013 23:54:32 +0200
Subject: [PATCH] update to newer ffmpeg

---
 submodules/build/builders.d/ffmpeg.mk | 7 ++++---
 submodules/externals/ffmpeg           | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/submodules/build/builders.d/ffmpeg.mk b/submodules/build/builders.d/ffmpeg.mk
index c47fd5fe4..7f8023bc6 100644
--- a/submodules/build/builders.d/ffmpeg.mk
+++ b/submodules/build/builders.d/ffmpeg.mk
@@ -4,13 +4,14 @@ ffmpeg_configure_options=\
 	--disable-ffprobe --disable-ffserver  --disable-avdevice \
 	--disable-avfilter  --disable-network \
 	--disable-everything  --enable-decoder=mjpeg --enable-encoder=mjpeg --enable-decoder=mpeg4 --enable-encoder=mpeg4 \
-	--enable-decoder=h264 --disable-avformat --enable-armv5te --enable-armv6 --enable-armv6t2 \
-	--enable-armvfp \
+	--enable-decoder=h264 --disable-avformat --enable-armv6 --enable-armv6t2 \
 	--cross-prefix=$$SDK_BIN_PATH/ \
 	--sysroot=$$SYSROOT_PATH --arch=$$ARCH \
 	--enable-static   --disable-shared --target-os=darwin \
 	--extra-cflags="-arch $$ARCH " --extra-ldflags="-arch $$ARCH -Wl,-syslibroot,$$SYSROOT_PATH " \
-	--source-path=$(BUILDER_SRC_DIR)/$(ffmpeg_dir) 
+	--disable-iconv \
+	--disable-armv5te
+
 #	--as=$(BUILDER_SRC_DIR)/externals/x264/extras/gas-preprocessor.pl
 
 #--sysinclude=PATH        location of cross-build system headers
diff --git a/submodules/externals/ffmpeg b/submodules/externals/ffmpeg
index 907783f22..2b8b2ba19 160000
--- a/submodules/externals/ffmpeg
+++ b/submodules/externals/ffmpeg
@@ -1 +1 @@
-Subproject commit 907783f221ad9594a528681e30777705f11bf0b5
+Subproject commit 2b8b2ba19fe0ca6594cb09439b9ead2c328a79d8