diff --git a/Makefile b/Makefile
index 12cba7448..f3f112abc 100644
--- a/Makefile
+++ b/Makefile
@@ -56,6 +56,7 @@ prepare-ffmpeg:
 ifeq ($(PATCH_FFMPEG),)
 	@patch -p0 < $(TOPDIR)/patches/ffmpeg_scalar_product_remove_alignment_hints.patch
 endif
+
 #libilbc
 LIBILBC_SRC_DIR=$(TOPDIR)/submodules/libilbc-rfc3951
 LIBILBC_BUILD_DIR=$(LIBILBC_SRC_DIR)
@@ -71,15 +72,41 @@ $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c: $(LIBILBC_BUILD_DIR)/Makefile
 	|| ( echo "iLBC prepare stage failed" ; exit 1 )
 	
 prepare-ilbc: $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c
+
 #libvpx
+PREPARE_VPX_DEPS := prepare-vpx-arm
+CLEAN_VPX_DEPS := clean-vpx-arm
+ifeq ($(BUILD_FOR_X86), 1)
+	PREPARE_VPX_DEPS += prepare-vpx-x86
+	CLEAN_VPX_DEPS += clean-vpx-x86
+endif
 LIBVPX_SRC_DIR=$(TOPDIR)/submodules/externals/libvpx
-$(LIBVPX_SRC_DIR)/vp8/common/asm_com_offsets.c.S:
-	cd $(LIBVPX_SRC_DIR) && \
-	./configure --target=armv7-android-gcc --sdk-path=$(NDK_PATH) --enable-error-concealment && \
-	make asm_com_offsets.asm \
-	|| ( echo "VP8 prepare stage failed." ; exit 1 )
-	
-prepare-vpx: $(LIBVPX_SRC_DIR)/vp8/common/asm_com_offsets.c.S
+LIBVPX_CONFIGURE_OPTIONS=--disable-vp9 --disable-examples --disable-unit-tests --disable-postproc --enable-error-concealment
+
+prepare-vpx-arm:
+	mkdir -p submodules/externals/build/libvpx/arm && \
+	cd submodules/externals/build/libvpx/arm && \
+	$(LIBVPX_SRC_DIR)/configure --target=armv7-android-gcc --sdk-path=$(NDK_PATH) $(LIBVPX_CONFIGURE_OPTIONS) && \
+	make -j ${NUMCPUS} \
+	|| ( echo "Prepare stage of libvpx for arm failed." ; exit 1 )
+
+prepare-vpx-x86:
+	mkdir -p submodules/externals/build/libvpx/x86 && \
+	cd submodules/externals/build/libvpx/x86 && \
+	$(LIBVPX_SRC_DIR)/configure --target=x86-android-gcc --sdk-path=$(NDK_PATH) $(LIBVPX_CONFIGURE_OPTIONS) --extra-cflags="--sysroot=$(NDK_PATH)/platforms/android-18/arch-x86" && \
+	make -j${NUMCPUS} \
+	|| ( echo "Prepare stage of libvpx for x86 failed." ; exit 1 )
+
+prepare-vpx: $(PREPARE_VPX_DEPS)
+
+clean-vpx-arm:
+	rm -rf submodules/externals/build/libvpx/arm
+
+clean-vpx-x86:
+	rm -rf submodules/externals/build/libvpx/x86
+
+clean-vpx: $(CLEAN_VPX_DEPS)
+
 #SILK
 LIBMSSILK_SRC_DIR=$(TOPDIR)/submodules/mssilk
 LIBMSSILK_BUILD_DIR=$(LIBMSSILK_SRC_DIR)
@@ -214,10 +241,12 @@ run-tests:
 	ant installd && \
 	adb shell am instrument -w -e size large org.linphone.test/android.test.InstrumentationTestRunner
 
-clean:
+clean-ndk-build:
 	$(NDK_PATH)/ndk-build clean $(LIBLINPHONE_OPTIONS)
 	ant clean
 
+clean: clean-ndk-build clean-vpx
+
 .PHONY: clean
 
 generate-sdk: generate-apk
diff --git a/jni/Android.mk b/jni/Android.mk
index 97ad3eb6a..235d81c23 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -3,13 +3,21 @@
 include $(linphone-root-dir)/submodules/linphone/mediastreamer2/src/android/libneon/Android.mk
 
 
-#disable video on non armv7 targets
-ifneq ($(TARGET_ARCH_ABI),armeabi-v7a)
-ifeq (,$(DUMP_VAR))
-$(info Video is disabled for other than armeabi-v7a)
-endif
+#enable video on armv7 and x86 targets only
 _BUILD_X264=0
 _BUILD_VIDEO=0
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+_BUILD_X264=1
+_BUILD_VIDEO=1
+endif
+ifeq ($(TARGET_ARCH_ABI),x86)
+_BUILD_X264=1
+_BUILD_VIDEO=1
+endif
+ifeq ($(_BUILD_VIDEO),0)
+ifeq (,$(DUMP_VAR))
+$(info Video is disabled for targets other than armeabi-v7a and x86)
+endif
 endif
 
 
@@ -90,10 +98,17 @@ include $(linphone-root-dir)/submodules/msx264/Android.mk
 include $(linphone-root-dir)/submodules/externals/build/x264/Android.mk
 endif
 
-include $(linphone-root-dir)/submodules/externals/build/ffmpeg/Android.mk
-include $(linphone-root-dir)/submodules/externals/build/ffmpeg-no-neon/Android.mk
+ifeq ($(TARGET_ARCH),arm)
+include $(linphone-root-dir)/submodules/externals/build/ffmpeg-arm/Android.mk
+include $(linphone-root-dir)/submodules/externals/build/ffmpeg-arm-no-neon/Android.mk
+endif
+ifeq ($(TARGET_ARCH),x86)
+include $(linphone-root-dir)/submodules/externals/build/ffmpeg-x86/Android-no-neon.mk
+include $(linphone-root-dir)/submodules/externals/build/ffmpeg-x86/Android.mk
+endif
 
 include $(linphone-root-dir)/submodules/externals/build/libvpx/Android.mk
+
 endif #_BUILD_VIDEO
 
 
@@ -108,10 +123,16 @@ ifeq ($(BUILD_SRTP), 1)
 include $(linphone-root-dir)/submodules/externals/build/srtp/Android.mk
 endif
 
+ifeq ($(TARGET_ARCH), arm)
 ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
 include $(linphone-root-dir)/submodules/linphone/build/android/Android.mk
 endif
 include $(linphone-root-dir)/submodules/linphone/build/android/Android-no-neon.mk
+endif
+ifeq ($(TARGET_ARCH), x86)
+include $(linphone-root-dir)/submodules/linphone/build/android/Android.mk
+include $(linphone-root-dir)/submodules/linphone/build/android/Android-no-neon.mk
+endif
 
 _BUILD_AMR=0
 ifneq ($(BUILD_AMRNB), 0)
diff --git a/submodules/externals/build/ffmpeg-no-neon/Android.mk b/submodules/externals/build/ffmpeg-arm-no-neon/Android.mk
similarity index 65%
rename from submodules/externals/build/ffmpeg-no-neon/Android.mk
rename to submodules/externals/build/ffmpeg-arm-no-neon/Android.mk
index 8ffaf9823..53d3cb55c 100755
--- a/submodules/externals/build/ffmpeg-no-neon/Android.mk
+++ b/submodules/externals/build/ffmpeg-arm-no-neon/Android.mk
@@ -1 +1 @@
-include  $(linphone-root-dir)/submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk
+include  $(linphone-root-dir)/submodules/externals/build/ffmpeg-arm-no-neon/Android_libavcodec.mk
diff --git a/submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk b/submodules/externals/build/ffmpeg-arm-no-neon/Android_libavcodec.mk
similarity index 98%
rename from submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk
rename to submodules/externals/build/ffmpeg-arm-no-neon/Android_libavcodec.mk
index c6a84e3c0..bade85dc7 100755
--- a/submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk
+++ b/submodules/externals/build/ffmpeg-arm-no-neon/Android_libavcodec.mk
@@ -99,7 +99,7 @@ LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
 
 #for including config.h:
 LOCAL_C_INCLUDES += \
-	$(LOCAL_PATH)/../build/ffmpeg-no-neon  \
+	$(LOCAL_PATH)/../build/ffmpeg-arm-no-neon \
 	$(LOCAL_PATH)/libavcodec/arm \
 	$(LOCAL_PATH)/ \
 	$(LOCAL_PATH)/libavutil 
diff --git a/submodules/externals/build/ffmpeg-no-neon/README b/submodules/externals/build/ffmpeg-arm-no-neon/README
similarity index 100%
rename from submodules/externals/build/ffmpeg-no-neon/README
rename to submodules/externals/build/ffmpeg-arm-no-neon/README
diff --git a/submodules/externals/build/ffmpeg-no-neon/config.h b/submodules/externals/build/ffmpeg-arm-no-neon/config.h
similarity index 100%
rename from submodules/externals/build/ffmpeg-no-neon/config.h
rename to submodules/externals/build/ffmpeg-arm-no-neon/config.h
diff --git a/submodules/externals/build/ffmpeg-no-neon/libavutil/avconfig.h b/submodules/externals/build/ffmpeg-arm-no-neon/libavutil/avconfig.h
similarity index 100%
rename from submodules/externals/build/ffmpeg-no-neon/libavutil/avconfig.h
rename to submodules/externals/build/ffmpeg-arm-no-neon/libavutil/avconfig.h
diff --git a/submodules/externals/build/ffmpeg-arm/Android.mk b/submodules/externals/build/ffmpeg-arm/Android.mk
new file mode 100755
index 000000000..68818f95d
--- /dev/null
+++ b/submodules/externals/build/ffmpeg-arm/Android.mk
@@ -0,0 +1,4 @@
+include  $(linphone-root-dir)/submodules/externals/build/ffmpeg-arm/Android_libavutil.mk
+include  $(linphone-root-dir)/submodules/externals/build/ffmpeg-arm/Android_libavcodec.mk
+include  $(linphone-root-dir)/submodules/externals/build/ffmpeg-arm/Android_libswscale.mk
+include  $(linphone-root-dir)/submodules/externals/build/ffmpeg-arm/Android_libavcore.mk
diff --git a/submodules/externals/build/ffmpeg/Android_libavcodec.mk b/submodules/externals/build/ffmpeg-arm/Android_libavcodec.mk
similarity index 98%
rename from submodules/externals/build/ffmpeg/Android_libavcodec.mk
rename to submodules/externals/build/ffmpeg-arm/Android_libavcodec.mk
index 0fdce0ed0..d9367ac19 100755
--- a/submodules/externals/build/ffmpeg/Android_libavcodec.mk
+++ b/submodules/externals/build/ffmpeg-arm/Android_libavcodec.mk
@@ -99,7 +99,7 @@ LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
 
 #for including config.h:
 LOCAL_C_INCLUDES += \
-	$(LOCAL_PATH)/../build/ffmpeg  \
+	$(LOCAL_PATH)/../build/ffmpeg-arm \
 	$(LOCAL_PATH)/libavcodec/arm \
 	$(LOCAL_PATH)/ \
 	$(LOCAL_PATH)/libavutil 
diff --git a/submodules/externals/build/ffmpeg/Android_libavcore.mk b/submodules/externals/build/ffmpeg-arm/Android_libavcore.mk
similarity index 84%
rename from submodules/externals/build/ffmpeg/Android_libavcore.mk
rename to submodules/externals/build/ffmpeg-arm/Android_libavcore.mk
index 350eb343e..68f54cb19 100644
--- a/submodules/externals/build/ffmpeg/Android_libavcore.mk
+++ b/submodules/externals/build/ffmpeg-arm/Android_libavcore.mk
@@ -19,7 +19,7 @@ LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
 
 
 #for including config.h:
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg  $(LOCAL_PATH)/
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg-arm $(LOCAL_PATH)/
 
 LOCAL_SHARED_LIBRARIES := liblinavutil
 
diff --git a/submodules/externals/build/ffmpeg/Android_libavutil.mk b/submodules/externals/build/ffmpeg-arm/Android_libavutil.mk
similarity index 92%
rename from submodules/externals/build/ffmpeg/Android_libavutil.mk
rename to submodules/externals/build/ffmpeg-arm/Android_libavutil.mk
index 837028f41..67025455f 100755
--- a/submodules/externals/build/ffmpeg/Android_libavutil.mk
+++ b/submodules/externals/build/ffmpeg-arm/Android_libavutil.mk
@@ -40,6 +40,6 @@ LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
 LOCAL_ARM_MODE := arm
 
 #for including config.h:
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg  $(LOCAL_PATH)/
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg-arm $(LOCAL_PATH)/
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/submodules/externals/build/ffmpeg/Android_libswscale.mk b/submodules/externals/build/ffmpeg-arm/Android_libswscale.mk
similarity index 87%
rename from submodules/externals/build/ffmpeg/Android_libswscale.mk
rename to submodules/externals/build/ffmpeg-arm/Android_libswscale.mk
index f3f7492d5..e69cab2d2 100755
--- a/submodules/externals/build/ffmpeg/Android_libswscale.mk
+++ b/submodules/externals/build/ffmpeg-arm/Android_libswscale.mk
@@ -16,7 +16,7 @@ LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
 LOCAL_ARM_MODE := arm
 
 #for including config.h:
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../build/ffmpeg  \
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../build/ffmpeg-arm \
 					$(LOCAL_PATH)/ \
 					$(LOCAL_PATH)/../
 
diff --git a/submodules/externals/build/ffmpeg/README b/submodules/externals/build/ffmpeg-arm/README
similarity index 100%
rename from submodules/externals/build/ffmpeg/README
rename to submodules/externals/build/ffmpeg-arm/README
diff --git a/submodules/externals/build/ffmpeg/config.h b/submodules/externals/build/ffmpeg-arm/config.h
similarity index 100%
rename from submodules/externals/build/ffmpeg/config.h
rename to submodules/externals/build/ffmpeg-arm/config.h
diff --git a/submodules/externals/build/ffmpeg/libavutil/avconfig.h b/submodules/externals/build/ffmpeg-arm/libavutil/avconfig.h
similarity index 100%
rename from submodules/externals/build/ffmpeg/libavutil/avconfig.h
rename to submodules/externals/build/ffmpeg-arm/libavutil/avconfig.h
diff --git a/submodules/externals/build/ffmpeg-x86/Android.mk b/submodules/externals/build/ffmpeg-x86/Android.mk
new file mode 100755
index 000000000..8871612d1
--- /dev/null
+++ b/submodules/externals/build/ffmpeg-x86/Android.mk
@@ -0,0 +1,4 @@
+include  $(linphone-root-dir)/submodules/externals/build/ffmpeg-x86/Android_libavutil.mk
+include  $(linphone-root-dir)/submodules/externals/build/ffmpeg-x86/Android_libavcodec.mk
+include  $(linphone-root-dir)/submodules/externals/build/ffmpeg-x86/Android_libswscale.mk
+include  $(linphone-root-dir)/submodules/externals/build/ffmpeg-x86/Android_libavcore.mk
diff --git a/submodules/externals/build/ffmpeg-x86/Android_libavcodec.mk b/submodules/externals/build/ffmpeg-x86/Android_libavcodec.mk
new file mode 100755
index 000000000..38d1870ae
--- /dev/null
+++ b/submodules/externals/build/ffmpeg-x86/Android_libavcodec.mk
@@ -0,0 +1,77 @@
+LOCAL_PATH:= $(call my-dir)/../../ffmpeg
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := liblinavcodec
+
+LOCAL_SRC_FILES = \
+	libavcodec/aandcttab.c \
+	libavcodec/allcodecs.c \
+	libavcodec/audioconvert.c \
+	libavcodec/avpacket.c \
+	libavcodec/bitstream.c \
+	libavcodec/bitstream_filter.c \
+	libavcodec/cabac.c \
+	libavcodec/dsputil.c \
+	libavcodec/error_resilience.c \
+	libavcodec/faandct.c \
+	libavcodec/faanidct.c \
+	libavcodec/flvdec.c \
+	libavcodec/flvenc.c \
+	libavcodec/golomb.c \
+	libavcodec/h263.c \
+	libavcodec/h263_parser.c \
+	libavcodec/h263dec.c \
+	libavcodec/h264.c \
+	libavcodec/h264_cabac.c \
+	libavcodec/h264_cavlc.c \
+	libavcodec/h264_direct.c \
+	libavcodec/h264_loopfilter.c \
+	libavcodec/h264_ps.c \
+	libavcodec/h264_refs.c \
+	libavcodec/h264_sei.c \
+	libavcodec/h264dsp.c \
+	libavcodec/h264idct.c \
+	libavcodec/h264pred.c \
+	libavcodec/imgconvert.c \
+	libavcodec/intelh263dec.c \
+	libavcodec/inverse.c \
+	libavcodec/ituh263dec.c \
+	libavcodec/ituh263enc.c \
+	libavcodec/jfdctfst.c \
+	libavcodec/jfdctint.c \
+	libavcodec/jrevdct.c \
+	libavcodec/mjpeg.c \
+	libavcodec/mjpegdec.c \
+	libavcodec/motion_est.c \
+	libavcodec/mpeg12data.c \
+	libavcodec/mpeg4video.c \
+	libavcodec/mpeg4video_parser.c \
+	libavcodec/mpeg4videodec.c \
+	libavcodec/mpeg4videoenc.c \
+	libavcodec/mpegvideo.c \
+	libavcodec/mpegvideo_enc.c \
+	libavcodec/opt.c \
+	libavcodec/options.c \
+	libavcodec/parser.c \
+	libavcodec/ratecontrol.c \
+	libavcodec/raw.c \
+	libavcodec/resample.c \
+	libavcodec/resample2.c \
+	libavcodec/simple_idct.c \
+	libavcodec/utils.c \
+	libavcodec/pthread.c
+
+
+LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H  --std=c99
+
+#for including config.h:
+LOCAL_C_INCLUDES += \
+	$(LOCAL_PATH)/../build/ffmpeg-x86 \
+	$(LOCAL_PATH)/libavcodec/x86 \
+	$(LOCAL_PATH)/ \
+	$(LOCAL_PATH)/libavutil 
+
+LOCAL_SHARED_LIBRARIES := liblinavutil liblinavcore
+
+include $(BUILD_SHARED_LIBRARY)
+
diff --git a/submodules/externals/build/ffmpeg-x86/Android_libavcore.mk b/submodules/externals/build/ffmpeg-x86/Android_libavcore.mk
new file mode 100644
index 000000000..0e288b9df
--- /dev/null
+++ b/submodules/externals/build/ffmpeg-x86/Android_libavcore.mk
@@ -0,0 +1,27 @@
+
+LOCAL_PATH:= $(call my-dir)/../../ffmpeg/
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := liblinavcore
+
+
+LOCAL_SRC_FILES := \
+	libavcore/imgutils.c \
+	libavcore/parseutils.c \
+	libavcore/utils.c 
+
+#	libavcore/samplefmt.c \
+#	libavcore/audioconvert.c
+
+
+LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
+
+
+
+#for including config.h:
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg-x86 $(LOCAL_PATH)/
+
+LOCAL_SHARED_LIBRARIES := liblinavutil
+
+include $(BUILD_SHARED_LIBRARY)
+
diff --git a/submodules/externals/build/ffmpeg-x86/Android_libavutil.mk b/submodules/externals/build/ffmpeg-x86/Android_libavutil.mk
new file mode 100755
index 000000000..65160edc2
--- /dev/null
+++ b/submodules/externals/build/ffmpeg-x86/Android_libavutil.mk
@@ -0,0 +1,43 @@
+
+LOCAL_PATH:= $(call my-dir)/../../ffmpeg/
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := liblinavutil
+
+
+LOCAL_SRC_FILES = \
+	libavutil/adler32.c \
+	libavutil/aes.c \
+	libavutil/avstring.c \
+	libavutil/base64.c \
+	libavutil/cpu.c \
+	libavutil/crc.c \
+	libavutil/des.c \
+	libavutil/error.c \
+	libavutil/eval.c \
+	libavutil/fifo.c \
+	libavutil/intfloat_readwrite.c \
+	libavutil/inverse.c \
+	libavutil/lfg.c \
+	libavutil/lls.c \
+	libavutil/log.c \
+	libavutil/lzo.c \
+	libavutil/mathematics.c \
+	libavutil/md5.c \
+	libavutil/mem.c \
+	libavutil/opt.c \
+	libavutil/pixdesc.c \
+	libavutil/random_seed.c \
+	libavutil/rational.c \
+	libavutil/rc4.c \
+	libavutil/sha.c \
+	libavutil/tree.c \
+	libavutil/utils.c \
+	libavutil/x86/cpu.c
+
+LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
+
+#for including config.h:
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg-x86 $(LOCAL_PATH)/
+include $(BUILD_SHARED_LIBRARY)
+
diff --git a/submodules/externals/build/ffmpeg-x86/Android_libswscale.mk b/submodules/externals/build/ffmpeg-x86/Android_libswscale.mk
new file mode 100755
index 000000000..869ae1000
--- /dev/null
+++ b/submodules/externals/build/ffmpeg-x86/Android_libswscale.mk
@@ -0,0 +1,24 @@
+##lib swcale###################
+LOCAL_PATH:= $(call my-dir)/../../ffmpeg/libswscale/
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := liblinswscale
+
+LOCAL_SRC_FILES = \
+	options.c \
+	rgb2rgb.c \
+	swscale.c \
+	utils.c \
+	yuv2rgb.c 
+
+LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
+
+#for including config.h:
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../build/ffmpeg-x86 \
+					$(LOCAL_PATH)/ \
+					$(LOCAL_PATH)/../
+
+LOCAL_SHARED_LIBRARIES := liblinavutil
+
+include $(BUILD_SHARED_LIBRARY)
+
diff --git a/submodules/externals/build/ffmpeg-x86/README b/submodules/externals/build/ffmpeg-x86/README
new file mode 100644
index 000000000..ac788c336
--- /dev/null
+++ b/submodules/externals/build/ffmpeg-x86/README
@@ -0,0 +1,3 @@
+config.h and list of sources files generated by the following configure invocation:
+
+./configure --prefix=/home/ghislain/opt --sysroot=/home/ghislain/android-ndk-r9/platforms/android-18/arch-x86 --enable-cross-compile --arch=x86 --target-os=linux --cc=i686-linux-android-gcc --disable-ffplay --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-avdevice --disable-avcore --disable-avfilter --disable-network --disable-everything --enable-decoder=mpeg4 --enable-encoder=mpeg4 --enable-decoder=h264 --enable-decoder=mjpeg --disable-avformat --enable-pic --disable-mmx --extra-cflags='-fPIC'
diff --git a/submodules/externals/build/ffmpeg-x86/config.h b/submodules/externals/build/ffmpeg-x86/config.h
new file mode 100644
index 000000000..cb2a7bcf7
--- /dev/null
+++ b/submodules/externals/build/ffmpeg-x86/config.h
@@ -0,0 +1,940 @@
+/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_H
+#define FFMPEG_CONFIG_H
+#define FFMPEG_CONFIGURATION "--prefix=/home/ghislain/opt --sysroot=/home/ghislain/android-ndk-r9/platforms/android-18/arch-x86 --enable-cross-compile --arch=x86 --target-os=linux --cc=i686-linux-android-gcc --disable-ffplay --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-avdevice --disable-avcore --disable-avfilter --disable-network --disable-everything --enable-decoder=mpeg4 --enable-encoder=mpeg4 --enable-decoder=h264 --enable-decoder=mjpeg --disable-avformat --enable-pic --disable-mmx --extra-cflags=-fPIC"
+#define FFMPEG_LICENSE "LGPL version 2.1 or later"
+#define FFMPEG_DATADIR "/home/ghislain/opt/share/ffmpeg"
+#define CC_TYPE "gcc"
+#define CC_VERSION __VERSION__
+#define restrict restrict
+#define ASMALIGN(ZEROBITS) ".p2align " #ZEROBITS "\n\t"
+#define EXTERN_PREFIX ""
+#define EXTERN_ASM 
+#define ARCH_ALPHA 0
+#define ARCH_ARM 0
+#define ARCH_AVR32 0
+#define ARCH_AVR32_AP 0
+#define ARCH_AVR32_UC 0
+#define ARCH_BFIN 0
+#define ARCH_IA64 0
+#define ARCH_M68K 0
+#define ARCH_MIPS 0
+#define ARCH_MIPS64 0
+#define ARCH_PARISC 0
+#define ARCH_PPC 0
+#define ARCH_PPC64 0
+#define ARCH_S390 0
+#define ARCH_SH4 0
+#define ARCH_SPARC 0
+#define ARCH_SPARC64 0
+#define ARCH_TOMI 0
+#define ARCH_X86 1
+#define ARCH_X86_32 1
+#define ARCH_X86_64 0
+#define HAVE_ALTIVEC 0
+#define HAVE_AMD3DNOW 0
+#define HAVE_AMD3DNOWEXT 0
+#define HAVE_ARMV5TE 0
+#define HAVE_ARMV6 0
+#define HAVE_ARMV6T2 0
+#define HAVE_ARMVFP 0
+#define HAVE_IWMMXT 0
+#define HAVE_MMI 0
+#define HAVE_MMX 0
+#define HAVE_MMX2 0
+#define HAVE_NEON 0
+#define HAVE_PPC4XX 0
+#define HAVE_SSE 0
+#define HAVE_SSSE3 0
+#define HAVE_VIS 0
+#define HAVE_BIGENDIAN 0
+#define HAVE_FAST_UNALIGNED 1
+#define HAVE_PTHREADS 1
+#define HAVE_W32THREADS 0
+#define HAVE_ALIGNED_STACK 1
+#define HAVE_ALSA_ASOUNDLIB_H 0
+#define HAVE_ALTIVEC_H 0
+#define HAVE_ARPA_INET_H 0
+#define HAVE_ATTRIBUTE_MAY_ALIAS 1
+#define HAVE_ATTRIBUTE_PACKED 1
+#define HAVE_BSWAP 1
+#define HAVE_CLOSESOCKET 0
+#define HAVE_CMOV 0
+#define HAVE_CONIO_H 0
+#define HAVE_DCBZL 0
+#define HAVE_DEV_BKTR_IOCTL_BT848_H 0
+#define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
+#define HAVE_DEV_IC_BT8XX_H 0
+#define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
+#define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0
+#define HAVE_DLFCN_H 1
+#define HAVE_DLOPEN 1
+#define HAVE_DOS_PATHS 0
+#define HAVE_EBP_AVAILABLE 0
+#define HAVE_EBX_AVAILABLE 0
+#define HAVE_EXP2 1
+#define HAVE_EXP2F 1
+#define HAVE_FAST_64BIT 0
+#define HAVE_FAST_CLZ 1
+#define HAVE_FAST_CMOV 0
+#define HAVE_FCNTL 1
+#define HAVE_FORK 1
+#define HAVE_GETADDRINFO 1
+#define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
+#define HAVE_GETPROCESSTIMES 0
+#define HAVE_GETRUSAGE 1
+#define HAVE_GNU_AS 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
+#define HAVE_IBM_ASM 0
+#define HAVE_INET_ATON 1
+#define HAVE_INLINE_ASM 1
+#define HAVE_ISATTY 1
+#define HAVE_LDBRX 0
+#define HAVE_LIBDC1394_1 0
+#define HAVE_LIBDC1394_2 0
+#define HAVE_LLRINT 1
+#define HAVE_LLRINTF 1
+#define HAVE_LOCAL_ALIGNED_16 1
+#define HAVE_LOCAL_ALIGNED_8 1
+#define HAVE_LOG2 0
+#define HAVE_LOG2F 0
+#define HAVE_LOONGSON 0
+#define HAVE_LRINT 1
+#define HAVE_LRINTF 1
+#define HAVE_LZO1X_999_COMPRESS 0
+#define HAVE_MACHINE_IOCTL_BT848_H 0
+#define HAVE_MACHINE_IOCTL_METEOR_H 0
+#define HAVE_MALLOC_H 1
+#define HAVE_MEMALIGN 1
+#define HAVE_MKSTEMP 1
+#define HAVE_PLD 0
+#define HAVE_POSIX_MEMALIGN 0
+#define HAVE_ROUND 1
+#define HAVE_ROUNDF 1
+#define HAVE_SDL 0
+#define HAVE_SDL_VIDEO_SIZE 0
+#define HAVE_SETMODE 0
+#define HAVE_SOCKLEN_T 0
+#define HAVE_SOUNDCARD_H 0
+#define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
+#define HAVE_STRERROR_R 1
+#define HAVE_STRTOK_R 1
+#define HAVE_STRUCT_ADDRINFO 0
+#define HAVE_STRUCT_IPV6_MREQ 0
+#define HAVE_STRUCT_SOCKADDR_IN6 0
+#define HAVE_STRUCT_SOCKADDR_SA_LEN 0
+#define HAVE_STRUCT_SOCKADDR_STORAGE 0
+#define HAVE_SYMVER 1
+#define HAVE_SYMVER_GNU_ASM 1
+#define HAVE_SYMVER_ASM_LABEL 0
+#define HAVE_SYS_MMAN_H 1
+#define HAVE_SYS_RESOURCE_H 1
+#define HAVE_SYS_SELECT_H 1
+#define HAVE_SYS_SOUNDCARD_H 0
+#define HAVE_SYS_VIDEOIO_H 0
+#define HAVE_TEN_OPERANDS 1
+#define HAVE_TERMIOS_H 1
+#define HAVE_THREADS 1
+#define HAVE_TRUNCF 1
+#define HAVE_VFP_ARGS 0
+#define HAVE_VIRTUALALLOC 0
+#define HAVE_WINSOCK2_H 0
+#define HAVE_XFORM_ASM 0
+#define HAVE_YASM 0
+#define CONFIG_BSFS 0
+#define CONFIG_DECODERS 1
+#define CONFIG_DEMUXERS 0
+#define CONFIG_ENCODERS 1
+#define CONFIG_FILTERS 0
+#define CONFIG_HWACCELS 0
+#define CONFIG_INDEVS 0
+#define CONFIG_MUXERS 0
+#define CONFIG_OUTDEVS 0
+#define CONFIG_PARSERS 1
+#define CONFIG_PROTOCOLS 1
+#define CONFIG_AANDCT 1
+#define CONFIG_AVCODEC 1
+#define CONFIG_AVCORE 0
+#define CONFIG_AVDEVICE 0
+#define CONFIG_AVFILTER 0
+#define CONFIG_AVFORMAT 0
+#define CONFIG_AVISYNTH 0
+#define CONFIG_BZLIB 0
+#define CONFIG_DCT 0
+#define CONFIG_DOC 1
+#define CONFIG_DWT 0
+#define CONFIG_DXVA2 0
+#define CONFIG_FASTDIV 1
+#define CONFIG_FFMPEG 0
+#define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
+#define CONFIG_FFSERVER 0
+#define CONFIG_FFT 0
+#define CONFIG_FREI0R 0
+#define CONFIG_GOLOMB 1
+#define CONFIG_GPL 0
+#define CONFIG_GRAY 0
+#define CONFIG_H264DSP 1
+#define CONFIG_H264PRED 1
+#define CONFIG_HARDCODED_TABLES 0
+#define CONFIG_HUFFMAN 0
+#define CONFIG_LIBDC1394 0
+#define CONFIG_LIBDIRAC 0
+#define CONFIG_LIBFAAC 0
+#define CONFIG_LIBGSM 0
+#define CONFIG_LIBMP3LAME 0
+#define CONFIG_LIBNUT 0
+#define CONFIG_LIBOPENCORE_AMRNB 0
+#define CONFIG_LIBOPENCORE_AMRWB 0
+#define CONFIG_LIBOPENCV 0
+#define CONFIG_LIBOPENJPEG 0
+#define CONFIG_LIBRTMP 0
+#define CONFIG_LIBSCHROEDINGER 0
+#define CONFIG_LIBSPEEX 0
+#define CONFIG_LIBTHEORA 0
+#define CONFIG_LIBVORBIS 0
+#define CONFIG_LIBVPX 0
+#define CONFIG_LIBX264 0
+#define CONFIG_LIBXAVS 0
+#define CONFIG_LIBXVID 0
+#define CONFIG_LPC 0
+#define CONFIG_LSP 0
+#define CONFIG_MDCT 0
+#define CONFIG_MEMALIGN_HACK 0
+#define CONFIG_MLIB 0
+#define CONFIG_MPEGAUDIO_HP 1
+#define CONFIG_NETWORK 0
+#define CONFIG_NONFREE 0
+#define CONFIG_PIC 1
+#define CONFIG_POSTPROC 0
+#define CONFIG_RDFT 0
+#define CONFIG_RUNTIME_CPUDETECT 0
+#define CONFIG_SHARED 0
+#define CONFIG_SMALL 0
+#define CONFIG_SRAM 0
+#define CONFIG_STATIC 1
+#define CONFIG_SWSCALE 1
+#define CONFIG_SWSCALE_ALPHA 1
+#define CONFIG_VAAPI 0
+#define CONFIG_VDPAU 0
+#define CONFIG_VERSION3 0
+#define CONFIG_X11GRAB 0
+#define CONFIG_ZLIB 0
+#define CONFIG_AVUTIL 1
+#define CONFIG_GPLV3 0
+#define CONFIG_LGPLV3 0
+#define CONFIG_AASC_DECODER 0
+#define CONFIG_AMV_DECODER 0
+#define CONFIG_ANM_DECODER 0
+#define CONFIG_ANSI_DECODER 0
+#define CONFIG_ASV1_DECODER 0
+#define CONFIG_ASV2_DECODER 0
+#define CONFIG_AURA_DECODER 0
+#define CONFIG_AURA2_DECODER 0
+#define CONFIG_AVS_DECODER 0
+#define CONFIG_BETHSOFTVID_DECODER 0
+#define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
+#define CONFIG_BMP_DECODER 0
+#define CONFIG_C93_DECODER 0
+#define CONFIG_CAVS_DECODER 0
+#define CONFIG_CDGRAPHICS_DECODER 0
+#define CONFIG_CINEPAK_DECODER 0
+#define CONFIG_CLJR_DECODER 0
+#define CONFIG_CSCD_DECODER 0
+#define CONFIG_CYUV_DECODER 0
+#define CONFIG_DNXHD_DECODER 0
+#define CONFIG_DPX_DECODER 0
+#define CONFIG_DSICINVIDEO_DECODER 0
+#define CONFIG_DVVIDEO_DECODER 0
+#define CONFIG_DXA_DECODER 0
+#define CONFIG_EACMV_DECODER 0
+#define CONFIG_EAMAD_DECODER 0
+#define CONFIG_EATGQ_DECODER 0
+#define CONFIG_EATGV_DECODER 0
+#define CONFIG_EATQI_DECODER 0
+#define CONFIG_EIGHTBPS_DECODER 0
+#define CONFIG_EIGHTSVX_EXP_DECODER 0
+#define CONFIG_EIGHTSVX_FIB_DECODER 0
+#define CONFIG_ESCAPE124_DECODER 0
+#define CONFIG_FFV1_DECODER 0
+#define CONFIG_FFVHUFF_DECODER 0
+#define CONFIG_FLASHSV_DECODER 0
+#define CONFIG_FLIC_DECODER 0
+#define CONFIG_FLV_DECODER 0
+#define CONFIG_FOURXM_DECODER 0
+#define CONFIG_FRAPS_DECODER 0
+#define CONFIG_FRWU_DECODER 0
+#define CONFIG_GIF_DECODER 0
+#define CONFIG_H261_DECODER 0
+#define CONFIG_H263_DECODER 1
+#define CONFIG_H263I_DECODER 0
+#define CONFIG_H264_DECODER 1
+#define CONFIG_H264_VDPAU_DECODER 0
+#define CONFIG_HUFFYUV_DECODER 0
+#define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
+#define CONFIG_INDEO2_DECODER 0
+#define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
+#define CONFIG_INTERPLAY_VIDEO_DECODER 0
+#define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
+#define CONFIG_KMVC_DECODER 0
+#define CONFIG_LOCO_DECODER 0
+#define CONFIG_MDEC_DECODER 0
+#define CONFIG_MIMIC_DECODER 0
+#define CONFIG_MJPEG_DECODER 1
+#define CONFIG_MJPEGB_DECODER 0
+#define CONFIG_MMVIDEO_DECODER 0
+#define CONFIG_MOTIONPIXELS_DECODER 0
+#define CONFIG_MPEG_XVMC_DECODER 0
+#define CONFIG_MPEG1VIDEO_DECODER 0
+#define CONFIG_MPEG2VIDEO_DECODER 0
+#define CONFIG_MPEG4_DECODER 1
+#define CONFIG_MPEG4_VDPAU_DECODER 0
+#define CONFIG_MPEGVIDEO_DECODER 0
+#define CONFIG_MPEG_VDPAU_DECODER 0
+#define CONFIG_MPEG1_VDPAU_DECODER 0
+#define CONFIG_MSMPEG4V1_DECODER 0
+#define CONFIG_MSMPEG4V2_DECODER 0
+#define CONFIG_MSMPEG4V3_DECODER 0
+#define CONFIG_MSRLE_DECODER 0
+#define CONFIG_MSVIDEO1_DECODER 0
+#define CONFIG_MSZH_DECODER 0
+#define CONFIG_NUV_DECODER 0
+#define CONFIG_PAM_DECODER 0
+#define CONFIG_PBM_DECODER 0
+#define CONFIG_PCX_DECODER 0
+#define CONFIG_PGM_DECODER 0
+#define CONFIG_PGMYUV_DECODER 0
+#define CONFIG_PICTOR_DECODER 0
+#define CONFIG_PNG_DECODER 0
+#define CONFIG_PPM_DECODER 0
+#define CONFIG_PTX_DECODER 0
+#define CONFIG_QDRAW_DECODER 0
+#define CONFIG_QPEG_DECODER 0
+#define CONFIG_QTRLE_DECODER 0
+#define CONFIG_R10K_DECODER 0
+#define CONFIG_R210_DECODER 0
+#define CONFIG_RAWVIDEO_DECODER 0
+#define CONFIG_RL2_DECODER 0
+#define CONFIG_ROQ_DECODER 0
+#define CONFIG_RPZA_DECODER 0
+#define CONFIG_RV10_DECODER 0
+#define CONFIG_RV20_DECODER 0
+#define CONFIG_RV30_DECODER 0
+#define CONFIG_RV40_DECODER 0
+#define CONFIG_SGI_DECODER 0
+#define CONFIG_SMACKER_DECODER 0
+#define CONFIG_SMC_DECODER 0
+#define CONFIG_SNOW_DECODER 0
+#define CONFIG_SP5X_DECODER 0
+#define CONFIG_SUNRAST_DECODER 0
+#define CONFIG_SVQ1_DECODER 0
+#define CONFIG_SVQ3_DECODER 0
+#define CONFIG_TARGA_DECODER 0
+#define CONFIG_THEORA_DECODER 0
+#define CONFIG_THP_DECODER 0
+#define CONFIG_TIERTEXSEQVIDEO_DECODER 0
+#define CONFIG_TIFF_DECODER 0
+#define CONFIG_TMV_DECODER 0
+#define CONFIG_TRUEMOTION1_DECODER 0
+#define CONFIG_TRUEMOTION2_DECODER 0
+#define CONFIG_TSCC_DECODER 0
+#define CONFIG_TXD_DECODER 0
+#define CONFIG_ULTI_DECODER 0
+#define CONFIG_V210_DECODER 0
+#define CONFIG_V210X_DECODER 0
+#define CONFIG_VB_DECODER 0
+#define CONFIG_VC1_DECODER 0
+#define CONFIG_VC1_VDPAU_DECODER 0
+#define CONFIG_VCR1_DECODER 0
+#define CONFIG_VMDVIDEO_DECODER 0
+#define CONFIG_VMNC_DECODER 0
+#define CONFIG_VP3_DECODER 0
+#define CONFIG_VP5_DECODER 0
+#define CONFIG_VP6_DECODER 0
+#define CONFIG_VP6A_DECODER 0
+#define CONFIG_VP6F_DECODER 0
+#define CONFIG_VP8_DECODER 0
+#define CONFIG_VQA_DECODER 0
+#define CONFIG_WMV1_DECODER 0
+#define CONFIG_WMV2_DECODER 0
+#define CONFIG_WMV3_DECODER 0
+#define CONFIG_WMV3_VDPAU_DECODER 0
+#define CONFIG_WNV1_DECODER 0
+#define CONFIG_XAN_WC3_DECODER 0
+#define CONFIG_XL_DECODER 0
+#define CONFIG_YOP_DECODER 0
+#define CONFIG_ZLIB_DECODER 0
+#define CONFIG_ZMBV_DECODER 0
+#define CONFIG_AAC_DECODER 0
+#define CONFIG_AC3_DECODER 0
+#define CONFIG_ALAC_DECODER 0
+#define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
+#define CONFIG_APE_DECODER 0
+#define CONFIG_ATRAC1_DECODER 0
+#define CONFIG_ATRAC3_DECODER 0
+#define CONFIG_BINKAUDIO_DCT_DECODER 0
+#define CONFIG_BINKAUDIO_RDFT_DECODER 0
+#define CONFIG_COOK_DECODER 0
+#define CONFIG_DCA_DECODER 0
+#define CONFIG_DSICINAUDIO_DECODER 0
+#define CONFIG_EAC3_DECODER 0
+#define CONFIG_FLAC_DECODER 0
+#define CONFIG_GSM_DECODER 0
+#define CONFIG_GSM_MS_DECODER 0
+#define CONFIG_IMC_DECODER 0
+#define CONFIG_MACE3_DECODER 0
+#define CONFIG_MACE6_DECODER 0
+#define CONFIG_MLP_DECODER 0
+#define CONFIG_MP1_DECODER 0
+#define CONFIG_MP1FLOAT_DECODER 0
+#define CONFIG_MP2_DECODER 0
+#define CONFIG_MP2FLOAT_DECODER 0
+#define CONFIG_MP3_DECODER 0
+#define CONFIG_MP3FLOAT_DECODER 0
+#define CONFIG_MP3ADU_DECODER 0
+#define CONFIG_MP3ADUFLOAT_DECODER 0
+#define CONFIG_MP3ON4_DECODER 0
+#define CONFIG_MP3ON4FLOAT_DECODER 0
+#define CONFIG_MPC7_DECODER 0
+#define CONFIG_MPC8_DECODER 0
+#define CONFIG_NELLYMOSER_DECODER 0
+#define CONFIG_QCELP_DECODER 0
+#define CONFIG_QDM2_DECODER 0
+#define CONFIG_RA_144_DECODER 0
+#define CONFIG_RA_288_DECODER 0
+#define CONFIG_SHORTEN_DECODER 0
+#define CONFIG_SIPR_DECODER 0
+#define CONFIG_SMACKAUD_DECODER 0
+#define CONFIG_SONIC_DECODER 0
+#define CONFIG_TRUEHD_DECODER 0
+#define CONFIG_TRUESPEECH_DECODER 0
+#define CONFIG_TTA_DECODER 0
+#define CONFIG_TWINVQ_DECODER 0
+#define CONFIG_VMDAUDIO_DECODER 0
+#define CONFIG_VORBIS_DECODER 0
+#define CONFIG_WAVPACK_DECODER 0
+#define CONFIG_WMAPRO_DECODER 0
+#define CONFIG_WMAV1_DECODER 0
+#define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAVOICE_DECODER 0
+#define CONFIG_WS_SND1_DECODER 0
+#define CONFIG_PCM_ALAW_DECODER 0
+#define CONFIG_PCM_BLURAY_DECODER 0
+#define CONFIG_PCM_DVD_DECODER 0
+#define CONFIG_PCM_F32BE_DECODER 0
+#define CONFIG_PCM_F32LE_DECODER 0
+#define CONFIG_PCM_F64BE_DECODER 0
+#define CONFIG_PCM_F64LE_DECODER 0
+#define CONFIG_PCM_MULAW_DECODER 0
+#define CONFIG_PCM_S8_DECODER 0
+#define CONFIG_PCM_S16BE_DECODER 0
+#define CONFIG_PCM_S16LE_DECODER 0
+#define CONFIG_PCM_S16LE_PLANAR_DECODER 0
+#define CONFIG_PCM_S24BE_DECODER 0
+#define CONFIG_PCM_S24DAUD_DECODER 0
+#define CONFIG_PCM_S24LE_DECODER 0
+#define CONFIG_PCM_S32BE_DECODER 0
+#define CONFIG_PCM_S32LE_DECODER 0
+#define CONFIG_PCM_U8_DECODER 0
+#define CONFIG_PCM_U16BE_DECODER 0
+#define CONFIG_PCM_U16LE_DECODER 0
+#define CONFIG_PCM_U24BE_DECODER 0
+#define CONFIG_PCM_U24LE_DECODER 0
+#define CONFIG_PCM_U32BE_DECODER 0
+#define CONFIG_PCM_U32LE_DECODER 0
+#define CONFIG_PCM_ZORK_DECODER 0
+#define CONFIG_INTERPLAY_DPCM_DECODER 0
+#define CONFIG_ROQ_DPCM_DECODER 0
+#define CONFIG_SOL_DPCM_DECODER 0
+#define CONFIG_XAN_DPCM_DECODER 0
+#define CONFIG_ADPCM_4XM_DECODER 0
+#define CONFIG_ADPCM_ADX_DECODER 0
+#define CONFIG_ADPCM_CT_DECODER 0
+#define CONFIG_ADPCM_EA_DECODER 0
+#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0
+#define CONFIG_ADPCM_EA_R1_DECODER 0
+#define CONFIG_ADPCM_EA_R2_DECODER 0
+#define CONFIG_ADPCM_EA_R3_DECODER 0
+#define CONFIG_ADPCM_EA_XAS_DECODER 0
+#define CONFIG_ADPCM_G722_DECODER 0
+#define CONFIG_ADPCM_G726_DECODER 0
+#define CONFIG_ADPCM_IMA_AMV_DECODER 0
+#define CONFIG_ADPCM_IMA_DK3_DECODER 0
+#define CONFIG_ADPCM_IMA_DK4_DECODER 0
+#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
+#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0
+#define CONFIG_ADPCM_IMA_ISS_DECODER 0
+#define CONFIG_ADPCM_IMA_QT_DECODER 0
+#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0
+#define CONFIG_ADPCM_IMA_WAV_DECODER 0
+#define CONFIG_ADPCM_IMA_WS_DECODER 0
+#define CONFIG_ADPCM_MS_DECODER 0
+#define CONFIG_ADPCM_SBPRO_2_DECODER 0
+#define CONFIG_ADPCM_SBPRO_3_DECODER 0
+#define CONFIG_ADPCM_SBPRO_4_DECODER 0
+#define CONFIG_ADPCM_SWF_DECODER 0
+#define CONFIG_ADPCM_THP_DECODER 0
+#define CONFIG_ADPCM_XA_DECODER 0
+#define CONFIG_ADPCM_YAMAHA_DECODER 0
+#define CONFIG_DVBSUB_DECODER 0
+#define CONFIG_DVDSUB_DECODER 0
+#define CONFIG_PGSSUB_DECODER 0
+#define CONFIG_XSUB_DECODER 0
+#define CONFIG_LIBDIRAC_DECODER 0
+#define CONFIG_LIBGSM_DECODER 0
+#define CONFIG_LIBGSM_MS_DECODER 0
+#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
+#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
+#define CONFIG_LIBOPENJPEG_DECODER 0
+#define CONFIG_LIBSCHROEDINGER_DECODER 0
+#define CONFIG_LIBSPEEX_DECODER 0
+#define CONFIG_LIBVPX_DECODER 0
+#define CONFIG_A64MULTI_ENCODER 0
+#define CONFIG_A64MULTI5_ENCODER 0
+#define CONFIG_ASV1_ENCODER 0
+#define CONFIG_ASV2_ENCODER 0
+#define CONFIG_BMP_ENCODER 0
+#define CONFIG_DNXHD_ENCODER 0
+#define CONFIG_DVVIDEO_ENCODER 0
+#define CONFIG_FFV1_ENCODER 0
+#define CONFIG_FFVHUFF_ENCODER 0
+#define CONFIG_FLASHSV_ENCODER 0
+#define CONFIG_FLV_ENCODER 0
+#define CONFIG_GIF_ENCODER 0
+#define CONFIG_H261_ENCODER 0
+#define CONFIG_H263_ENCODER 1
+#define CONFIG_H263P_ENCODER 0
+#define CONFIG_HUFFYUV_ENCODER 0
+#define CONFIG_JPEGLS_ENCODER 0
+#define CONFIG_LJPEG_ENCODER 0
+#define CONFIG_MJPEG_ENCODER 0
+#define CONFIG_MPEG1VIDEO_ENCODER 0
+#define CONFIG_MPEG2VIDEO_ENCODER 0
+#define CONFIG_MPEG4_ENCODER 1
+#define CONFIG_MSMPEG4V1_ENCODER 0
+#define CONFIG_MSMPEG4V2_ENCODER 0
+#define CONFIG_MSMPEG4V3_ENCODER 0
+#define CONFIG_PAM_ENCODER 0
+#define CONFIG_PBM_ENCODER 0
+#define CONFIG_PCX_ENCODER 0
+#define CONFIG_PGM_ENCODER 0
+#define CONFIG_PGMYUV_ENCODER 0
+#define CONFIG_PNG_ENCODER 0
+#define CONFIG_PPM_ENCODER 0
+#define CONFIG_QTRLE_ENCODER 0
+#define CONFIG_RAWVIDEO_ENCODER 0
+#define CONFIG_ROQ_ENCODER 0
+#define CONFIG_RV10_ENCODER 0
+#define CONFIG_RV20_ENCODER 0
+#define CONFIG_SGI_ENCODER 0
+#define CONFIG_SNOW_ENCODER 0
+#define CONFIG_SVQ1_ENCODER 0
+#define CONFIG_TARGA_ENCODER 0
+#define CONFIG_TIFF_ENCODER 0
+#define CONFIG_V210_ENCODER 0
+#define CONFIG_WMV1_ENCODER 0
+#define CONFIG_WMV2_ENCODER 0
+#define CONFIG_ZLIB_ENCODER 0
+#define CONFIG_ZMBV_ENCODER 0
+#define CONFIG_AAC_ENCODER 0
+#define CONFIG_AC3_ENCODER 0
+#define CONFIG_ALAC_ENCODER 0
+#define CONFIG_FLAC_ENCODER 0
+#define CONFIG_MP2_ENCODER 0
+#define CONFIG_NELLYMOSER_ENCODER 0
+#define CONFIG_RA_144_ENCODER 0
+#define CONFIG_SONIC_ENCODER 0
+#define CONFIG_SONIC_LS_ENCODER 0
+#define CONFIG_VORBIS_ENCODER 0
+#define CONFIG_WMAV1_ENCODER 0
+#define CONFIG_WMAV2_ENCODER 0
+#define CONFIG_PCM_ALAW_ENCODER 0
+#define CONFIG_PCM_F32BE_ENCODER 0
+#define CONFIG_PCM_F32LE_ENCODER 0
+#define CONFIG_PCM_F64BE_ENCODER 0
+#define CONFIG_PCM_F64LE_ENCODER 0
+#define CONFIG_PCM_MULAW_ENCODER 0
+#define CONFIG_PCM_S8_ENCODER 0
+#define CONFIG_PCM_S16BE_ENCODER 0
+#define CONFIG_PCM_S16LE_ENCODER 0
+#define CONFIG_PCM_S24BE_ENCODER 0
+#define CONFIG_PCM_S24DAUD_ENCODER 0
+#define CONFIG_PCM_S24LE_ENCODER 0
+#define CONFIG_PCM_S32BE_ENCODER 0
+#define CONFIG_PCM_S32LE_ENCODER 0
+#define CONFIG_PCM_U8_ENCODER 0
+#define CONFIG_PCM_U16BE_ENCODER 0
+#define CONFIG_PCM_U16LE_ENCODER 0
+#define CONFIG_PCM_U24BE_ENCODER 0
+#define CONFIG_PCM_U24LE_ENCODER 0
+#define CONFIG_PCM_U32BE_ENCODER 0
+#define CONFIG_PCM_U32LE_ENCODER 0
+#define CONFIG_PCM_ZORK_ENCODER 0
+#define CONFIG_ROQ_DPCM_ENCODER 0
+#define CONFIG_ADPCM_ADX_ENCODER 0
+#define CONFIG_ADPCM_G722_ENCODER 0
+#define CONFIG_ADPCM_G726_ENCODER 0
+#define CONFIG_ADPCM_IMA_QT_ENCODER 0
+#define CONFIG_ADPCM_IMA_WAV_ENCODER 0
+#define CONFIG_ADPCM_MS_ENCODER 0
+#define CONFIG_ADPCM_SWF_ENCODER 0
+#define CONFIG_ADPCM_YAMAHA_ENCODER 0
+#define CONFIG_DVBSUB_ENCODER 0
+#define CONFIG_DVDSUB_ENCODER 0
+#define CONFIG_XSUB_ENCODER 0
+#define CONFIG_LIBDIRAC_ENCODER 0
+#define CONFIG_LIBFAAC_ENCODER 0
+#define CONFIG_LIBGSM_ENCODER 0
+#define CONFIG_LIBGSM_MS_ENCODER 0
+#define CONFIG_LIBMP3LAME_ENCODER 0
+#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
+#define CONFIG_LIBSCHROEDINGER_ENCODER 0
+#define CONFIG_LIBTHEORA_ENCODER 0
+#define CONFIG_LIBVORBIS_ENCODER 0
+#define CONFIG_LIBVPX_ENCODER 0
+#define CONFIG_LIBX264_ENCODER 0
+#define CONFIG_LIBXAVS_ENCODER 0
+#define CONFIG_LIBXVID_ENCODER 0
+#define CONFIG_H263_VAAPI_HWACCEL 0
+#define CONFIG_H264_DXVA2_HWACCEL 0
+#define CONFIG_H264_VAAPI_HWACCEL 0
+#define CONFIG_MPEG2_DXVA2_HWACCEL 0
+#define CONFIG_MPEG2_VAAPI_HWACCEL 0
+#define CONFIG_MPEG4_VAAPI_HWACCEL 0
+#define CONFIG_VC1_DXVA2_HWACCEL 0
+#define CONFIG_VC1_VAAPI_HWACCEL 0
+#define CONFIG_WMV3_DXVA2_HWACCEL 0
+#define CONFIG_WMV3_VAAPI_HWACCEL 0
+#define CONFIG_AAC_PARSER 0
+#define CONFIG_AC3_PARSER 0
+#define CONFIG_CAVSVIDEO_PARSER 0
+#define CONFIG_DCA_PARSER 0
+#define CONFIG_DIRAC_PARSER 0
+#define CONFIG_DNXHD_PARSER 0
+#define CONFIG_DVBSUB_PARSER 0
+#define CONFIG_DVDSUB_PARSER 0
+#define CONFIG_H261_PARSER 0
+#define CONFIG_H263_PARSER 1
+#define CONFIG_H264_PARSER 0
+#define CONFIG_MJPEG_PARSER 0
+#define CONFIG_MLP_PARSER 0
+#define CONFIG_MPEG4VIDEO_PARSER 1
+#define CONFIG_MPEGAUDIO_PARSER 0
+#define CONFIG_MPEGVIDEO_PARSER 0
+#define CONFIG_PNM_PARSER 0
+#define CONFIG_VC1_PARSER 0
+#define CONFIG_VP3_PARSER 0
+#define CONFIG_VP8_PARSER 0
+#define CONFIG_AAC_ADTSTOASC_BSF 0
+#define CONFIG_CHOMP_BSF 0
+#define CONFIG_DUMP_EXTRADATA_BSF 0
+#define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_IMX_DUMP_HEADER_BSF 0
+#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
+#define CONFIG_MP3_HEADER_COMPRESS_BSF 0
+#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
+#define CONFIG_MOV2TEXTSUB_BSF 0
+#define CONFIG_NOISE_BSF 0
+#define CONFIG_REMOVE_EXTRADATA_BSF 0
+#define CONFIG_TEXT2MOVSUB_BSF 0
+#define CONFIG_AAC_DEMUXER 0
+#define CONFIG_AC3_DEMUXER 0
+#define CONFIG_AEA_DEMUXER 0
+#define CONFIG_AIFF_DEMUXER 0
+#define CONFIG_AMR_DEMUXER 0
+#define CONFIG_ANM_DEMUXER 0
+#define CONFIG_APC_DEMUXER 0
+#define CONFIG_APE_DEMUXER 0
+#define CONFIG_APPLEHTTP_DEMUXER 0
+#define CONFIG_ASF_DEMUXER 0
+#define CONFIG_ASS_DEMUXER 0
+#define CONFIG_AU_DEMUXER 0
+#define CONFIG_AVI_DEMUXER 0
+#define CONFIG_AVISYNTH_DEMUXER 0
+#define CONFIG_AVS_DEMUXER 0
+#define CONFIG_BETHSOFTVID_DEMUXER 0
+#define CONFIG_BFI_DEMUXER 0
+#define CONFIG_BINK_DEMUXER 0
+#define CONFIG_C93_DEMUXER 0
+#define CONFIG_CAF_DEMUXER 0
+#define CONFIG_CAVSVIDEO_DEMUXER 0
+#define CONFIG_CDG_DEMUXER 0
+#define CONFIG_DAUD_DEMUXER 0
+#define CONFIG_DIRAC_DEMUXER 0
+#define CONFIG_DNXHD_DEMUXER 0
+#define CONFIG_DSICIN_DEMUXER 0
+#define CONFIG_DTS_DEMUXER 0
+#define CONFIG_DV_DEMUXER 0
+#define CONFIG_DXA_DEMUXER 0
+#define CONFIG_EA_DEMUXER 0
+#define CONFIG_EA_CDATA_DEMUXER 0
+#define CONFIG_EAC3_DEMUXER 0
+#define CONFIG_FFM_DEMUXER 0
+#define CONFIG_FILMSTRIP_DEMUXER 0
+#define CONFIG_FLAC_DEMUXER 0
+#define CONFIG_FLIC_DEMUXER 0
+#define CONFIG_FLV_DEMUXER 0
+#define CONFIG_FOURXM_DEMUXER 0
+#define CONFIG_G722_DEMUXER 0
+#define CONFIG_GSM_DEMUXER 0
+#define CONFIG_GXF_DEMUXER 0
+#define CONFIG_H261_DEMUXER 0
+#define CONFIG_H263_DEMUXER 0
+#define CONFIG_H264_DEMUXER 0
+#define CONFIG_IDCIN_DEMUXER 0
+#define CONFIG_IFF_DEMUXER 0
+#define CONFIG_IMAGE2_DEMUXER 0
+#define CONFIG_IMAGE2PIPE_DEMUXER 0
+#define CONFIG_INGENIENT_DEMUXER 0
+#define CONFIG_IPMOVIE_DEMUXER 0
+#define CONFIG_ISS_DEMUXER 0
+#define CONFIG_IV8_DEMUXER 0
+#define CONFIG_IVF_DEMUXER 0
+#define CONFIG_LMLM4_DEMUXER 0
+#define CONFIG_M4V_DEMUXER 0
+#define CONFIG_MATROSKA_DEMUXER 0
+#define CONFIG_MJPEG_DEMUXER 0
+#define CONFIG_MLP_DEMUXER 0
+#define CONFIG_MM_DEMUXER 0
+#define CONFIG_MMF_DEMUXER 0
+#define CONFIG_MOV_DEMUXER 0
+#define CONFIG_MP3_DEMUXER 0
+#define CONFIG_MPC_DEMUXER 0
+#define CONFIG_MPC8_DEMUXER 0
+#define CONFIG_MPEGPS_DEMUXER 0
+#define CONFIG_MPEGTS_DEMUXER 0
+#define CONFIG_MPEGTSRAW_DEMUXER 0
+#define CONFIG_MPEGVIDEO_DEMUXER 0
+#define CONFIG_MSNWC_TCP_DEMUXER 0
+#define CONFIG_MTV_DEMUXER 0
+#define CONFIG_MVI_DEMUXER 0
+#define CONFIG_MXF_DEMUXER 0
+#define CONFIG_NC_DEMUXER 0
+#define CONFIG_NSV_DEMUXER 0
+#define CONFIG_NUT_DEMUXER 0
+#define CONFIG_NUV_DEMUXER 0
+#define CONFIG_OGG_DEMUXER 0
+#define CONFIG_OMA_DEMUXER 0
+#define CONFIG_PCM_ALAW_DEMUXER 0
+#define CONFIG_PCM_MULAW_DEMUXER 0
+#define CONFIG_PCM_F64BE_DEMUXER 0
+#define CONFIG_PCM_F64LE_DEMUXER 0
+#define CONFIG_PCM_F32BE_DEMUXER 0
+#define CONFIG_PCM_F32LE_DEMUXER 0
+#define CONFIG_PCM_S32BE_DEMUXER 0
+#define CONFIG_PCM_S32LE_DEMUXER 0
+#define CONFIG_PCM_S24BE_DEMUXER 0
+#define CONFIG_PCM_S24LE_DEMUXER 0
+#define CONFIG_PCM_S16BE_DEMUXER 0
+#define CONFIG_PCM_S16LE_DEMUXER 0
+#define CONFIG_PCM_S8_DEMUXER 0
+#define CONFIG_PCM_U32BE_DEMUXER 0
+#define CONFIG_PCM_U32LE_DEMUXER 0
+#define CONFIG_PCM_U24BE_DEMUXER 0
+#define CONFIG_PCM_U24LE_DEMUXER 0
+#define CONFIG_PCM_U16BE_DEMUXER 0
+#define CONFIG_PCM_U16LE_DEMUXER 0
+#define CONFIG_PCM_U8_DEMUXER 0
+#define CONFIG_PVA_DEMUXER 0
+#define CONFIG_QCP_DEMUXER 0
+#define CONFIG_R3D_DEMUXER 0
+#define CONFIG_RAWVIDEO_DEMUXER 0
+#define CONFIG_RL2_DEMUXER 0
+#define CONFIG_RM_DEMUXER 0
+#define CONFIG_ROQ_DEMUXER 0
+#define CONFIG_RPL_DEMUXER 0
+#define CONFIG_RSO_DEMUXER 0
+#define CONFIG_RTSP_DEMUXER 0
+#define CONFIG_SDP_DEMUXER 0
+#define CONFIG_SEGAFILM_DEMUXER 0
+#define CONFIG_SHORTEN_DEMUXER 0
+#define CONFIG_SIFF_DEMUXER 0
+#define CONFIG_SMACKER_DEMUXER 0
+#define CONFIG_SOL_DEMUXER 0
+#define CONFIG_SOX_DEMUXER 0
+#define CONFIG_SRT_DEMUXER 0
+#define CONFIG_STR_DEMUXER 0
+#define CONFIG_SWF_DEMUXER 0
+#define CONFIG_THP_DEMUXER 0
+#define CONFIG_TIERTEXSEQ_DEMUXER 0
+#define CONFIG_TMV_DEMUXER 0
+#define CONFIG_TRUEHD_DEMUXER 0
+#define CONFIG_TTA_DEMUXER 0
+#define CONFIG_TXD_DEMUXER 0
+#define CONFIG_TTY_DEMUXER 0
+#define CONFIG_VC1_DEMUXER 0
+#define CONFIG_VC1T_DEMUXER 0
+#define CONFIG_VMD_DEMUXER 0
+#define CONFIG_VOC_DEMUXER 0
+#define CONFIG_VQF_DEMUXER 0
+#define CONFIG_W64_DEMUXER 0
+#define CONFIG_WAV_DEMUXER 0
+#define CONFIG_WC3_DEMUXER 0
+#define CONFIG_WSAUD_DEMUXER 0
+#define CONFIG_WSVQA_DEMUXER 0
+#define CONFIG_WV_DEMUXER 0
+#define CONFIG_XA_DEMUXER 0
+#define CONFIG_YOP_DEMUXER 0
+#define CONFIG_YUV4MPEGPIPE_DEMUXER 0
+#define CONFIG_LIBNUT_DEMUXER 0
+#define CONFIG_A64_MUXER 0
+#define CONFIG_AC3_MUXER 0
+#define CONFIG_ADTS_MUXER 0
+#define CONFIG_AIFF_MUXER 0
+#define CONFIG_AMR_MUXER 0
+#define CONFIG_ASF_MUXER 0
+#define CONFIG_ASS_MUXER 0
+#define CONFIG_ASF_STREAM_MUXER 0
+#define CONFIG_AU_MUXER 0
+#define CONFIG_AVI_MUXER 0
+#define CONFIG_AVM2_MUXER 0
+#define CONFIG_CAVSVIDEO_MUXER 0
+#define CONFIG_CRC_MUXER 0
+#define CONFIG_DAUD_MUXER 0
+#define CONFIG_DIRAC_MUXER 0
+#define CONFIG_DNXHD_MUXER 0
+#define CONFIG_DTS_MUXER 0
+#define CONFIG_DV_MUXER 0
+#define CONFIG_EAC3_MUXER 0
+#define CONFIG_FFM_MUXER 0
+#define CONFIG_FILMSTRIP_MUXER 0
+#define CONFIG_FLAC_MUXER 0
+#define CONFIG_FLV_MUXER 0
+#define CONFIG_FRAMECRC_MUXER 0
+#define CONFIG_FRAMEMD5_MUXER 0
+#define CONFIG_G722_MUXER 0
+#define CONFIG_GIF_MUXER 0
+#define CONFIG_GXF_MUXER 0
+#define CONFIG_H261_MUXER 0
+#define CONFIG_H263_MUXER 0
+#define CONFIG_H264_MUXER 0
+#define CONFIG_IMAGE2_MUXER 0
+#define CONFIG_IMAGE2PIPE_MUXER 0
+#define CONFIG_IPOD_MUXER 0
+#define CONFIG_M4V_MUXER 0
+#define CONFIG_MD5_MUXER 0
+#define CONFIG_MATROSKA_MUXER 0
+#define CONFIG_MATROSKA_AUDIO_MUXER 0
+#define CONFIG_MJPEG_MUXER 0
+#define CONFIG_MLP_MUXER 0
+#define CONFIG_MMF_MUXER 0
+#define CONFIG_MOV_MUXER 0
+#define CONFIG_MP2_MUXER 0
+#define CONFIG_MP3_MUXER 0
+#define CONFIG_MP4_MUXER 0
+#define CONFIG_MPEG1SYSTEM_MUXER 0
+#define CONFIG_MPEG1VCD_MUXER 0
+#define CONFIG_MPEG1VIDEO_MUXER 0
+#define CONFIG_MPEG2DVD_MUXER 0
+#define CONFIG_MPEG2SVCD_MUXER 0
+#define CONFIG_MPEG2VIDEO_MUXER 0
+#define CONFIG_MPEG2VOB_MUXER 0
+#define CONFIG_MPEGTS_MUXER 0
+#define CONFIG_MPJPEG_MUXER 0
+#define CONFIG_MXF_MUXER 0
+#define CONFIG_MXF_D10_MUXER 0
+#define CONFIG_NULL_MUXER 0
+#define CONFIG_NUT_MUXER 0
+#define CONFIG_OGG_MUXER 0
+#define CONFIG_PCM_ALAW_MUXER 0
+#define CONFIG_PCM_MULAW_MUXER 0
+#define CONFIG_PCM_F64BE_MUXER 0
+#define CONFIG_PCM_F64LE_MUXER 0
+#define CONFIG_PCM_F32BE_MUXER 0
+#define CONFIG_PCM_F32LE_MUXER 0
+#define CONFIG_PCM_S32BE_MUXER 0
+#define CONFIG_PCM_S32LE_MUXER 0
+#define CONFIG_PCM_S24BE_MUXER 0
+#define CONFIG_PCM_S24LE_MUXER 0
+#define CONFIG_PCM_S16BE_MUXER 0
+#define CONFIG_PCM_S16LE_MUXER 0
+#define CONFIG_PCM_S8_MUXER 0
+#define CONFIG_PCM_U32BE_MUXER 0
+#define CONFIG_PCM_U32LE_MUXER 0
+#define CONFIG_PCM_U24BE_MUXER 0
+#define CONFIG_PCM_U24LE_MUXER 0
+#define CONFIG_PCM_U16BE_MUXER 0
+#define CONFIG_PCM_U16LE_MUXER 0
+#define CONFIG_PCM_U8_MUXER 0
+#define CONFIG_PSP_MUXER 0
+#define CONFIG_RAWVIDEO_MUXER 0
+#define CONFIG_RM_MUXER 0
+#define CONFIG_ROQ_MUXER 0
+#define CONFIG_RSO_MUXER 0
+#define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
+#define CONFIG_SOX_MUXER 0
+#define CONFIG_SPDIF_MUXER 0
+#define CONFIG_SRT_MUXER 0
+#define CONFIG_SWF_MUXER 0
+#define CONFIG_TG2_MUXER 0
+#define CONFIG_TGP_MUXER 0
+#define CONFIG_TRUEHD_MUXER 0
+#define CONFIG_VC1T_MUXER 0
+#define CONFIG_VOC_MUXER 0
+#define CONFIG_WAV_MUXER 0
+#define CONFIG_WEBM_MUXER 0
+#define CONFIG_YUV4MPEGPIPE_MUXER 0
+#define CONFIG_LIBNUT_MUXER 0
+#define CONFIG_ANULL_FILTER 0
+#define CONFIG_ANULLSRC_FILTER 0
+#define CONFIG_ANULLSINK_FILTER 0
+#define CONFIG_ASPECT_FILTER 0
+#define CONFIG_BLACKFRAME_FILTER 0
+#define CONFIG_CROP_FILTER 0
+#define CONFIG_FIFO_FILTER 0
+#define CONFIG_FORMAT_FILTER 0
+#define CONFIG_FREI0R_FILTER 0
+#define CONFIG_HFLIP_FILTER 0
+#define CONFIG_NOFORMAT_FILTER 0
+#define CONFIG_NULL_FILTER 0
+#define CONFIG_OCV_SMOOTH_FILTER 0
+#define CONFIG_PAD_FILTER 0
+#define CONFIG_PIXDESCTEST_FILTER 0
+#define CONFIG_PIXELASPECT_FILTER 0
+#define CONFIG_SCALE_FILTER 0
+#define CONFIG_SLICIFY_FILTER 0
+#define CONFIG_UNSHARP_FILTER 0
+#define CONFIG_VFLIP_FILTER 0
+#define CONFIG_YADIF_FILTER 0
+#define CONFIG_BUFFER_FILTER 0
+#define CONFIG_COLOR_FILTER 0
+#define CONFIG_NULLSRC_FILTER 0
+#define CONFIG_NULLSINK_FILTER 0
+#define CONFIG_CONCAT_PROTOCOL 0
+#define CONFIG_FILE_PROTOCOL 0
+#define CONFIG_GOPHER_PROTOCOL 0
+#define CONFIG_HTTP_PROTOCOL 0
+#define CONFIG_MMSH_PROTOCOL 0
+#define CONFIG_MMST_PROTOCOL 0
+#define CONFIG_MD5_PROTOCOL 0
+#define CONFIG_PIPE_PROTOCOL 0
+#define CONFIG_RTMP_PROTOCOL 0
+#define CONFIG_RTMPT_PROTOCOL 0
+#define CONFIG_RTMPE_PROTOCOL 0
+#define CONFIG_RTMPTE_PROTOCOL 0
+#define CONFIG_RTMPS_PROTOCOL 0
+#define CONFIG_RTP_PROTOCOL 0
+#define CONFIG_TCP_PROTOCOL 0
+#define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_ALSA_INDEV 0
+#define CONFIG_BKTR_INDEV 0
+#define CONFIG_DV1394_INDEV 0
+#define CONFIG_JACK_INDEV 0
+#define CONFIG_OSS_INDEV 0
+#define CONFIG_V4L2_INDEV 0
+#define CONFIG_V4L_INDEV 0
+#define CONFIG_VFWCAP_INDEV 0
+#define CONFIG_X11_GRAB_DEVICE_INDEV 0
+#define CONFIG_LIBDC1394_INDEV 0
+#define CONFIG_ALSA_OUTDEV 0
+#define CONFIG_OSS_OUTDEV 0
+#endif /* FFMPEG_CONFIG_H */
diff --git a/submodules/externals/build/ffmpeg-x86/libavutil/avconfig.h b/submodules/externals/build/ffmpeg-x86/libavutil/avconfig.h
new file mode 100644
index 000000000..f10aa6186
--- /dev/null
+++ b/submodules/externals/build/ffmpeg-x86/libavutil/avconfig.h
@@ -0,0 +1,6 @@
+/* Generated by ffconf */
+#ifndef AVUTIL_AVCONFIG_H
+#define AVUTIL_AVCONFIG_H
+#define AV_HAVE_BIGENDIAN 0
+#define AV_HAVE_FAST_UNALIGNED 1
+#endif /* AVUTIL_AVCONFIG_H */
diff --git a/submodules/externals/build/ffmpeg/Android.mk b/submodules/externals/build/ffmpeg/Android.mk
deleted file mode 100755
index a4b3f1c41..000000000
--- a/submodules/externals/build/ffmpeg/Android.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-include  $(linphone-root-dir)/submodules/externals/build/ffmpeg/Android_libavutil.mk
-include  $(linphone-root-dir)/submodules/externals/build/ffmpeg/Android_libavcodec.mk
-include  $(linphone-root-dir)/submodules/externals/build/ffmpeg/Android_libswscale.mk
-include  $(linphone-root-dir)/submodules/externals/build/ffmpeg/Android_libavcore.mk
diff --git a/submodules/externals/build/libvpx/Android.mk b/submodules/externals/build/libvpx/Android.mk
index 9d6c2a9ce..fd9f09d94 100755
--- a/submodules/externals/build/libvpx/Android.mk
+++ b/submodules/externals/build/libvpx/Android.mk
@@ -1,225 +1,7 @@
-
-LOCAL_PATH:= $(call my-dir)/../../libvpx
+LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libvpx
+LOCAL_SRC_FILES := $(TARGET_ARCH)/libvpx.a
 
-LOCAL_CFLAGS := -O3 -fPIC -D_FORTIFY_SOURCE=0 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wdeclaration-after-statement -Wdisabled-optimization -Wpointer-arith -Wtype-limits -Wcast-qual -Wno-unused-function
-
-LOCAL_ARM_MODE := arm
-ASM := .asm.s
-
-
-### vpx_mem.mk
-MEM_SRCS = vpx_mem/vpx_mem.c
-
-### vpx_scale
-SCALE_SRCS = vpx_scale/generic/vpxscale.c
-SCALE_SRCS += vpx_scale/generic/yv12config.c
-SCALE_SRCS += vpx_scale/generic/yv12extend.c
-SCALE_SRCS += vpx_scale/generic/gen_scalers.c
-
-#neon
-SCALE_SRCS += vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon$(ASM).neon
-SCALE_SRCS += vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon$(ASM).neon
-SCALE_SRCS += vpx_scale/arm/neon/vp8_vpxyv12_copysrcframe_func_neon$(ASM).neon
-SCALE_SRCS += vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon$(ASM).neon
-SCALE_SRCS += vpx_scale/arm/neon/yv12extend_arm.c
-
-### vp8cx_arm
-#File list for arm
-# encoder
-VP8_CX_SRCS += vp8/encoder/arm/dct_arm.c
-VP8_CX_SRCS += vp8/encoder/arm/quantize_arm.c
-
-#File list for armv5te
-# encoder
-VP8_CX_SRCS += vp8/encoder/arm/boolhuff_arm.c
-VP8_CX_SRCS += vp8/encoder/arm/armv5te/boolhuff_armv5te$(ASM)
-VP8_CX_SRCS += vp8/encoder/arm/armv5te/vp8_packtokens_armv5$(ASM)
-VP8_CX_SRCS += vp8/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5$(ASM)
-VP8_CX_SRCS += vp8/encoder/arm/armv5te/vp8_packtokens_partitions_armv5$(ASM)
-
-#File list for armv6
-# encoder
-VP8_CX_SRCS += vp8/encoder/arm/armv6/vp8_subtract_armv6$(ASM)
-VP8_CX_SRCS += vp8/encoder/arm/armv6/vp8_short_fdct4x4_armv6$(ASM)
-VP8_CX_SRCS += vp8/encoder/arm/armv6/vp8_fast_quantize_b_armv6$(ASM)
-VP8_CX_SRCS += vp8/encoder/arm/armv6/vp8_mse16x16_armv6$(ASM)
-VP8_CX_SRCS += vp8/encoder/arm/armv6/walsh_v6$(ASM)
-
-#File list for neon
-# encoder
-VP8_CX_SRCS += vp8/encoder/arm/neon/fastquantizeb_neon$(ASM).neon
-VP8_CX_SRCS += vp8/encoder/arm/neon/picklpf_arm.c.neon
-VP8_CX_SRCS += vp8/encoder/arm/neon/shortfdct_neon$(ASM).neon
-VP8_CX_SRCS += vp8/encoder/arm/neon/subtract_neon$(ASM).neon
-VP8_CX_SRCS += vp8/encoder/arm/neon/vp8_mse16x16_neon$(ASM).neon
-VP8_CX_SRCS += vp8/encoder/arm/neon/vp8_memcpy_neon$(ASM).neon
-VP8_CX_SRCS += vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon$(ASM).neon
-
-### vp8_cx
-VP8_CX_SRCS += vp8/vp8_cx_iface.c
-
-VP8_CX_SRCS += vp8/encoder/asm_enc_offsets.c
-VP8_CX_SRCS += vp8/encoder/bitstream.c
-VP8_CX_SRCS += vp8/encoder/dct.c
-VP8_CX_SRCS += vp8/encoder/encodeframe.c
-VP8_CX_SRCS += vp8/encoder/encodeintra.c
-VP8_CX_SRCS += vp8/encoder/encodemb.c
-VP8_CX_SRCS += vp8/encoder/encodemv.c
-VP8_CX_SRCS += vp8/encoder/ethreading.c
-VP8_CX_SRCS += vp8/encoder/denoising.c
-VP8_CX_SRCS += vp8/encoder/lookahead.c
-VP8_CX_SRCS += vp8/encoder/mcomp.c
-VP8_CX_SRCS += vp8/encoder/modecosts.c
-VP8_CX_SRCS += vp8/encoder/onyx_if.c
-VP8_CX_SRCS += vp8/encoder/pickinter.c
-VP8_CX_SRCS += vp8/encoder/picklpf.c
-VP8_CX_SRCS += vp8/encoder/psnr.c
-VP8_CX_SRCS += vp8/encoder/quantize.c
-VP8_CX_SRCS += vp8/encoder/ratectrl.c
-VP8_CX_SRCS += vp8/encoder/rdopt.c
-VP8_CX_SRCS += vp8/encoder/segmentation.c
-VP8_CX_SRCS += vp8/encoder/tokenize.c
-VP8_CX_SRCS += vp8/encoder/treewriter.c
-
-### vp8_common
-VP8_COMMON_SRCS = vp8/common/alloccommon.c
-VP8_COMMON_SRCS += vp8/common/asm_com_offsets.c
-VP8_COMMON_SRCS += vp8/common/blockd.c
-VP8_COMMON_SRCS += vp8/common/debugmodes.c
-VP8_COMMON_SRCS += vp8/common/dequantize.c
-VP8_COMMON_SRCS += vp8/common/entropy.c
-VP8_COMMON_SRCS += vp8/common/entropymode.c
-VP8_COMMON_SRCS += vp8/common/entropymv.c
-VP8_COMMON_SRCS += vp8/common/extend.c
-VP8_COMMON_SRCS += vp8/common/filter.c
-VP8_COMMON_SRCS += vp8/common/findnearmv.c
-VP8_COMMON_SRCS += vp8/common/generic/systemdependent.c
-VP8_COMMON_SRCS += vp8/common/idct_blk.c
-VP8_COMMON_SRCS += vp8/common/idctllm.c
-VP8_COMMON_SRCS += vp8/common/rtcd.c
-VP8_COMMON_SRCS += vp8/common/loopfilter.c
-VP8_COMMON_SRCS += vp8/common/loopfilter_filters.c
-VP8_COMMON_SRCS += vp8/common/mbpitch.c
-VP8_COMMON_SRCS += vp8/common/modecont.c
-VP8_COMMON_SRCS += vp8/common/quant_common.c
-VP8_COMMON_SRCS += vp8/common/reconinter.c
-VP8_COMMON_SRCS += vp8/common/reconintra.c
-VP8_COMMON_SRCS += vp8/common/reconintra4x4.c
-VP8_COMMON_SRCS += vp8/common/sad_c.c
-VP8_COMMON_SRCS += vp8/common/setupintrarecon.c
-VP8_COMMON_SRCS += vp8/common/swapyv12buffer.c
-VP8_COMMON_SRCS += vp8/common/variance_c.c
-VP8_COMMON_SRCS += vp8/common/treecoder.c
-
-# common (c)
-VP8_COMMON_SRCS += vp8/common/arm/filter_arm.c
-VP8_COMMON_SRCS += vp8/common/arm/loopfilter_arm.c
-VP8_COMMON_SRCS += vp8/common/arm/reconintra_arm.c
-VP8_COMMON_SRCS += vp8/common/arm/dequantize_arm.c
-VP8_COMMON_SRCS += vp8/common/arm/variance_arm.c
-VP8_COMMON_SRCS += vp8/common/arm/bilinearfilter_arm.c
-
-# common (armv6)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/bilinearfilter_v6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/copymem8x4_v6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/copymem8x8_v6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/copymem16x16_v6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/dc_only_idct_add_v6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/iwalsh_v6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/filter_v6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/idct_v6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/loopfilter_v6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/simpleloopfilter_v6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/sixtappredict8x4_v6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/intra4x4_predict_v6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/dequant_idct_v6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/dequantize_v6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/idct_blk_v6.c
-VP8_COMMON_SRCS += vp8/common/arm/armv6/vp8_sad16x16_armv6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/vp8_variance8x8_armv6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/vp8_variance16x16_armv6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6$(ASM)
-
-# common (neon)
-VP8_COMMON_SRCS += vp8/common/arm/neon/bilinearpredict4x4_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/bilinearpredict8x4_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/bilinearpredict8x8_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/bilinearpredict16x16_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/copymem8x4_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/copymem8x8_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/copymem16x16_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/dc_only_idct_add_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/iwalsh_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/loopfilter_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/loopfiltersimpleverticaledge_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/mbloopfilter_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/shortidct4x4llm_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/sad8_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/sad16_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/sixtappredict4x4_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/sixtappredict8x4_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/sixtappredict8x8_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/sixtappredict16x16_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/buildintrapredictorsmby_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/save_reg_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/dequant_idct_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/idct_dequant_full_2x_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/idct_dequant_0_2x_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/dequantizeb_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/idct_blk_neon.c.neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/variance_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/vp8_subpixelvariance8x8_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/vp8_subpixelvariance16x16_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/vp8_subpixelvariance16x16s_neon$(ASM).neon
-
-
-#File list for armv6
-
-
-### vp8dx
-VP8_DX_SRCS = vp8/vp8_dx_iface.c
-VP8_DX_SRCS += vp8/decoder/asm_dec_offsets.c
-VP8_DX_SRCS += vp8/decoder/dboolhuff.c
-VP8_DX_SRCS += vp8/decoder/decodemv.c
-VP8_DX_SRCS += vp8/decoder/decodframe.c
-VP8_DX_SRCS += vp8/decoder/detokenize.c
-VP8_DX_SRCS += vp8/decoder/error_concealment.c
-VP8_DX_SRCS += vp8/decoder/onyxd_if.c
-VP8_DX_SRCS += vp8/decoder/threading.c
-
-### vpx_codec
-API_SRCS = vpx/src/vpx_decoder.c
-API_SRCS += vpx/src/vpx_encoder.c
-API_SRCS += vpx/src/vpx_codec.c
-API_SRCS += vpx/src/vpx_image.c
-
-LOCAL_SRC_FILES = $(MEM_SRCS)
-LOCAL_SRC_FILES += $(SCALE_SRCS)
-LOCAL_SRC_FILES += $(VP8_CX_SRCS)
-LOCAL_SRC_FILES += $(VP8_COMMON_SRCS)
-LOCAL_SRC_FILES += $(VP8_DX_SRCS)
-LOCAL_SRC_FILES += $(API_SRCS)
-
-LOCAL_SRC_FILES += vpx_ports/arm_cpudetect.c
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-
-LOCAL_C_INCLUDES += \
-	$(LOCAL_PATH) \
-   	$(LOCAL_PATH)/vpx_ports \
-	$(LOCAL_PATH)/vp8/common \
-	$(LOCAL_PATH)/vp8/encoder \
-	$(LOCAL_PATH)/vp8/decoder \
-	$(LOCAL_PATH)/vp8 \
-	$(LOCAL_PATH)/vpx_codec
-
-LOCAL_STATIC_LIBRARIES += cpufeatures
-
-include $(BUILD_STATIC_LIBRARY)
-$(call import-module,android/cpufeatures)
+include $(PREBUILT_STATIC_LIBRARY)
diff --git a/submodules/externals/build/libvpx/asm_com_offsets.asm b/submodules/externals/build/libvpx/asm_com_offsets.asm
deleted file mode 100644
index 2b5be63af..000000000
--- a/submodules/externals/build/libvpx/asm_com_offsets.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-@ This file was created from a .asm file
-@  using the ads2gas.pl script.
-	.equ DO1STROUNDING, 0
-.equ yv12_buffer_config_y_width ,  0
-.equ yv12_buffer_config_y_height ,  4
-.equ yv12_buffer_config_y_stride ,  8
-.equ yv12_buffer_config_uv_width ,  12
-.equ yv12_buffer_config_uv_height ,  16
-.equ yv12_buffer_config_uv_stride ,  20
-.equ yv12_buffer_config_y_buffer ,  24
-.equ yv12_buffer_config_u_buffer ,  28
-.equ yv12_buffer_config_v_buffer ,  32
-.equ yv12_buffer_config_border ,  40
-	.section	.note.GNU-stack,"",%progbits
diff --git a/submodules/externals/build/libvpx/asm_conversion.sh b/submodules/externals/build/libvpx/asm_conversion.sh
deleted file mode 100755
index a78c8f0cb..000000000
--- a/submodules/externals/build/libvpx/asm_conversion.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#/bin/sh
-for i in `find ../../libvpx/ -name "*asm"`; 
-do 
-	newname=`echo ${i} |sed 's/\.asm/.s/'`
-	echo "Converting : ${i} -> ${newname}"
-	cat ${i}|perl ../../libvpx/build/make/ads2gas.pl > ${newname}; 
-done
diff --git a/submodules/externals/build/libvpx/asm_enc_offsets.asm b/submodules/externals/build/libvpx/asm_enc_offsets.asm
deleted file mode 100644
index 8add5f458..000000000
--- a/submodules/externals/build/libvpx/asm_enc_offsets.asm
+++ /dev/null
@@ -1,46 +0,0 @@
-@ This file was created from a .asm file
-@  using the ads2gas.pl script.
-	.equ DO1STROUNDING, 0
-.equ vp8_block_coeff ,  4
-.equ vp8_block_zbin ,  20
-.equ vp8_block_round ,  28
-.equ vp8_block_quant ,  8
-.equ vp8_block_quant_fast ,  12
-.equ vp8_block_zbin_extra ,  32
-.equ vp8_block_zrun_zbin_boost ,  24
-.equ vp8_block_quant_shift ,  16
-.equ vp8_blockd_qcoeff ,  0
-.equ vp8_blockd_dequant ,  16
-.equ vp8_blockd_dqcoeff ,  4
-.equ vp8_blockd_eob ,  44
-.equ vp8_block_base_src ,  36
-.equ vp8_block_src ,  40
-.equ vp8_block_src_diff ,  0
-.equ vp8_block_src_stride ,  44
-.equ vp8_blockd_predictor ,  8
-.equ vp8_writer_lowvalue ,  0
-.equ vp8_writer_range ,  4
-.equ vp8_writer_value ,  8
-.equ vp8_writer_count ,  12
-.equ vp8_writer_pos ,  16
-.equ vp8_writer_buffer ,  20
-.equ tokenextra_token ,  6
-.equ tokenextra_extra ,  4
-.equ tokenextra_context_tree ,  0
-.equ tokenextra_skip_eob_node ,  7
-.equ TOKENEXTRA_SZ ,  8
-.equ vp8_extra_bit_struct_sz ,  16
-.equ vp8_token_value ,  0
-.equ vp8_token_len ,  4
-.equ vp8_extra_bit_struct_tree ,  0
-.equ vp8_extra_bit_struct_prob ,  4
-.equ vp8_extra_bit_struct_len ,  8
-.equ vp8_extra_bit_struct_base_val ,  12
-.equ vp8_comp_tplist ,  177724
-.equ vp8_comp_common ,  104640
-.equ vp8_comp_bc2 ,  124848
-.equ tokenlist_start ,  0
-.equ tokenlist_stop ,  4
-.equ TOKENLIST_SZ ,  8
-.equ vp8_common_mb_rows ,  13224
-	.section	.note.GNU-stack,"",%progbits
diff --git a/submodules/externals/build/libvpx/cpu-features.h b/submodules/externals/build/libvpx/cpu-features.h
deleted file mode 100644
index e6a7db71a..000000000
--- a/submodules/externals/build/libvpx/cpu-features.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef CPU_FEATURES_H
-#define CPU_FEATURES_H
-
-#include <sys/cdefs.h>
-#include <stdint.h>
-
-__BEGIN_DECLS
-
-typedef enum {
-    ANDROID_CPU_FAMILY_UNKNOWN = 0,
-    ANDROID_CPU_FAMILY_ARM,
-    ANDROID_CPU_FAMILY_X86,
-
-    ANDROID_CPU_FAMILY_MAX  /* do not remove */
-
-} AndroidCpuFamily;
-
-/* Return family of the device's CPU */
-extern AndroidCpuFamily   android_getCpuFamily(void);
-
-enum {
-    ANDROID_CPU_ARM_FEATURE_ARMv7 = (1 << 0),
-    ANDROID_CPU_ARM_FEATURE_VFPv3 = (1 << 1),
-    ANDROID_CPU_ARM_FEATURE_NEON  = (1 << 2),
-};
-
-extern uint64_t    android_getCpuFeatures(void);
-
-__END_DECLS
-
-#endif /* CPU_FEATURES_H */
diff --git a/submodules/externals/build/libvpx/vpx_config.h b/submodules/externals/build/libvpx/vpx_config.h
deleted file mode 100644
index 48047b699..000000000
--- a/submodules/externals/build/libvpx/vpx_config.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
-/*  */
-/* Use of this source code is governed by a BSD-style license */
-/* that can be found in the LICENSE file in the root of the source */
-/* tree. An additional intellectual property rights grant can be found */
-/* in the file PATENTS.  All contributing project authors may */
-/* be found in the AUTHORS file in the root of the source tree. */
-/* This file automatically generated by configure. Do not edit! */
-#ifndef VPX_CONFIG_H
-#define VPX_CONFIG_H
-#define RESTRICT    
-#define ARCH_ARM 1
-#define ARCH_MIPS 0
-#define ARCH_X86 0
-#define ARCH_X86_64 0
-#define ARCH_PPC32 0
-#define ARCH_PPC64 0
-#define HAVE_ARMV5TE 1
-#define HAVE_ARMV6 1
-#define HAVE_ARMV7 1
-#define HAVE_MIPS32 0
-#define HAVE_MMX 0
-#define HAVE_SSE 0
-#define HAVE_SSE2 0
-#define HAVE_SSE3 0
-#define HAVE_SSSE3 0
-#define HAVE_SSE4_1 0
-#define HAVE_ALTIVEC 0
-#define HAVE_VPX_PORTS 1
-#define HAVE_STDINT_H 1
-#define HAVE_ALT_TREE_LAYOUT 0
-#define HAVE_PTHREAD_H 1
-#define HAVE_SYS_MMAN_H 1
-#define HAVE_UNISTD_H 1
-#define CONFIG_EXTERNAL_BUILD 0
-#define CONFIG_INSTALL_DOCS 0
-#define CONFIG_INSTALL_BINS 1
-#define CONFIG_INSTALL_LIBS 1
-#define CONFIG_INSTALL_SRCS 0
-#define CONFIG_DEBUG 0
-#define CONFIG_GPROF 0
-#define CONFIG_GCOV 0
-#define CONFIG_RVCT 0
-#define CONFIG_GCC 1
-#define CONFIG_MSVS 0
-#define CONFIG_PIC 1
-#define CONFIG_BIG_ENDIAN 0
-#define CONFIG_CODEC_SRCS 0
-#define CONFIG_DEBUG_LIBS 0
-#define CONFIG_FAST_UNALIGNED 1
-#define CONFIG_MEM_MANAGER 0
-#define CONFIG_MEM_TRACKER 0
-#define CONFIG_MEM_CHECKS 0
-#define CONFIG_MD5 1
-#define CONFIG_DEQUANT_TOKENS 0
-#define CONFIG_DC_RECON 0
-#define CONFIG_RUNTIME_CPU_DETECT 1
-#define CONFIG_POSTPROC 0
-#define CONFIG_MULTITHREAD 1
-#define CONFIG_INTERNAL_STATS 0
-#define CONFIG_VP8_ENCODER 1
-#define CONFIG_VP8_DECODER 1
-#define CONFIG_VP8 1
-#define CONFIG_ENCODERS 1
-#define CONFIG_DECODERS 1
-#define CONFIG_STATIC_MSVCRT 0
-#define CONFIG_SPATIAL_RESAMPLING 1
-#define CONFIG_REALTIME_ONLY 1
-#define CONFIG_ERROR_CONCEALMENT 0
-#define CONFIG_SHARED 0
-#define CONFIG_STATIC 1
-#define CONFIG_SMALL 0
-#define CONFIG_POSTPROC_VISUALIZER 0
-#define CONFIG_OS_SUPPORT 1
-#define CONFIG_UNIT_TESTS 0
-#define CONFIG_MULTI_RES_ENCODING 0
-#endif /* VPX_CONFIG_H */
diff --git a/submodules/externals/build/libvpx/vpx_version.h b/submodules/externals/build/libvpx/vpx_version.h
deleted file mode 100644
index 800b1dcac..000000000
--- a/submodules/externals/build/libvpx/vpx_version.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#define VERSION_MAJOR  1
-#define VERSION_MINOR  0
-#define VERSION_PATCH  0
-#define VERSION_EXTRA  ""
-#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
-#define VERSION_STRING_NOSP "v1.0.0"
-#define VERSION_STRING      " v1.0.0"
diff --git a/submodules/externals/build/srtp/Android.mk b/submodules/externals/build/srtp/Android.mk
index f40c8a2bd..ca9b524c2 100644
--- a/submodules/externals/build/srtp/Android.mk
+++ b/submodules/externals/build/srtp/Android.mk
@@ -52,6 +52,10 @@ LOCAL_C_INCLUDES += \
 
 
 # Build dynamic and static versions
+ifeq ($(TARGET_ARCH), x86)
+LOCAL_MODULE:= libsrtp
+include $(BUILD_SHARED_LIBRARY)
+else
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 LOCAL_MODULE:= libsrtp
 include $(BUILD_SHARED_LIBRARY)
@@ -59,5 +63,4 @@ else
 LOCAL_MODULE:= libsrtp-static
 include $(BUILD_STATIC_LIBRARY)
 endif
-
-
+endif
diff --git a/submodules/externals/libvpx b/submodules/externals/libvpx
index b9ce43029..db9235657 160000
--- a/submodules/externals/libvpx
+++ b/submodules/externals/libvpx
@@ -1 +1 @@
-Subproject commit b9ce43029298182668d4dcb0e0814189e4a63c2a
+Subproject commit db9235657741ce3fa5b9226f55d780304320ef8c