diff --git a/.gitmodules b/.gitmodules
index 391eac1a0..d05d4ab10 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,9 @@
 [submodule "submodules/libilbc-rfc3951"]
 	path = submodules/libilbc-rfc3951
 	url = git://git.linphone.org/libilbc-rfc3951.git
+[submodule "submodules/externals/ffmpeg"]
+	path = submodules/externals/ffmpeg
+	url = git://git.ffmpeg.org/ffmpeg
+[submodule "submodules/externals/libswscale"]
+	path = submodules/externals/libswscale
+	url = git://git.ffmpeg.org/libswscale
diff --git a/jni/Android.mk b/jni/Android.mk
index 2c48606fe..6d6221014 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -14,11 +14,11 @@ include $(root-dir)/submodules/linphone/mediastreamer2/build/android/Android.mk
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 include $(root-dir)/submodules/msilbc/Android.mk
+include $(root-dir)/submodules/externals/build/ffmpeg/Android.mk
 endif
 
-
-
 include $(root-dir)/submodules/linphone/build/android/Android.mk
 
 
 
+
diff --git a/jni/Application.mk b/jni/Application.mk
index fc0c90e73..2518aa3ac 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1,7 +1,9 @@
 APP_PROJECT_PATH := $(call my-dir)/../
-APP_MODULES      :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2 liblinphone
+APP_MODULES      :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2  liblinphone
+
+
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-APP_MODULES      +=libmsilbc
+APP_MODULES      +=libmsilbc libavutil libavcodec libswscale
 endif
 APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk
 APP_PLATFORM := android-3
diff --git a/submodules/externals/build/ffmpeg/Android_libavcodec.mk b/submodules/externals/build/ffmpeg/Android_libavcodec.mk
index b7306abc1..bb653b64c 100755
--- a/submodules/externals/build/ffmpeg/Android_libavcodec.mk
+++ b/submodules/externals/build/ffmpeg/Android_libavcodec.mk
@@ -6,21 +6,21 @@ LOCAL_MODULE := libavcodec
 LOCAL_SRC_FILES = \
 	libavcodec/allcodecs.c \
 	libavcodec/aandcttab.c \
-	libavcodec/arm/dsputil_arm.s.arm \
-	libavcodec/arm/dsputil_armv6.s.arm \
+	libavcodec/arm/dsputil_arm.S.arm \
+	libavcodec/arm/dsputil_armv6.S.arm \
 	libavcodec/arm/dsputil_init_arm.c \
 	libavcodec/arm/dsputil_init_armv5te.c \
 	libavcodec/arm/dsputil_init_armv6.c \
 	libavcodec/arm/fft_init_arm.c \
 	libavcodec/arm/h264dsp_init_arm.c \
 	libavcodec/arm/h264pred_init_arm.c \
-	libavcodec/arm/jrevdct_arm.s \
-	libavcodec/arm/mpegvideo_arm.s \
+	libavcodec/arm/jrevdct_arm.S \
+	libavcodec/arm/mpegvideo_arm.c \
 	libavcodec/arm/mpegvideo_armv5te.c \
 	libavcodec/arm/mpegvideo_armv5te_s.S \
-	libavcodec/arm/simple_idct_arm.s \
-	libavcodec/arm/simple_idct_armv5te.s \
-	libavcodec/arm/simple_idct_armv6.s \
+	libavcodec/arm/simple_idct_arm.S \
+	libavcodec/arm/simple_idct_armv5te.S \
+	libavcodec/arm/simple_idct_armv6.S \
 	libavcodec/audioconvert.c.arm \
 	libavcodec/avpacket.c \
 	libavcodec/bitstream.c \
@@ -74,11 +74,13 @@ LOCAL_SRC_FILES = \
 	libavcodec/utils.c 
 
 
+#LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H -Wa,-I$(LOCAL_PATH)/libavcodec/arm
 LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H 
 
 #for including config.h:
 LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/../build/ffmpeg  \
+	$(LOCAL_PATH)/libavcodec/arm \
 	$(LOCAL_PATH)/ \
 	$(LOCAL_PATH)/libavutil 
 
diff --git a/submodules/externals/build/ffmpeg/Android_libswscale.mk b/submodules/externals/build/ffmpeg/Android_libswscale.mk
index 811a269e4..6cf5295e9 100755
--- a/submodules/externals/build/ffmpeg/Android_libswscale.mk
+++ b/submodules/externals/build/ffmpeg/Android_libswscale.mk
@@ -1,19 +1,21 @@
 ##lib swcale###################
-LOCAL_PATH:= $(call my-dir)../../ffmpeg/
+LOCAL_PATH:= $(call my-dir)/../../libswscale/
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libswscale
 
 LOCAL_SRC_FILES = \
-	libswscale/options.c \
-	libswscale/rgb2rgb.c \
-	libswscale/swscale.c \
-	libswscale/utils.c \
-	libswscale/yuv2rgb.c 
+	options.c \
+	rgb2rgb.c \
+	swscale.c \
+	utils.c \
+	yuv2rgb.c 
 
 LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
 
 #for including config.h:
-LOCAL_C_INCLUDES += $(call my-dir)/
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg  \
+					$(LOCAL_PATH)/../ffmpeg \
+					$(LOCAL_PATH)/ 
 include $(BUILD_STATIC_LIBRARY)
 
diff --git a/submodules/externals/ffmpeg b/submodules/externals/ffmpeg
new file mode 160000
index 000000000..76393d0b7
--- /dev/null
+++ b/submodules/externals/ffmpeg
@@ -0,0 +1 @@
+Subproject commit 76393d0b78fd47857fd7bd27756945c1bb021efd
diff --git a/submodules/externals/libswscale b/submodules/externals/libswscale
new file mode 160000
index 000000000..fae6720e5
--- /dev/null
+++ b/submodules/externals/libswscale
@@ -0,0 +1 @@
+Subproject commit fae6720e516a0c1448a22b4a5cbc67e6819c965e