diff --git a/jni/Android.mk b/jni/Android.mk
index 6d6221014..22bd02fdf 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,5 +1,9 @@
 root-dir:=$(APP_PROJECT_PATH)
 
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+LINPHONE_VIDEO=1
+endif
+
 include $(root-dir)/submodules/externals/build/speex/Android.mk
 
 include $(root-dir)/submodules/externals/build/gsm/Android.mk
diff --git a/jni/Application.mk b/jni/Application.mk
index 2518aa3ac..09915589e 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -3,7 +3,7 @@ APP_MODULES      :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2
 
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-APP_MODULES      +=libmsilbc libavutil libavcodec libswscale
+APP_MODULES      +=libmsilbc libavutil libavcore libavcodec libswscale
 endif
 APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk
 APP_PLATFORM := android-3
diff --git a/libs/armeabi-v7a/liblinphone.so b/libs/armeabi-v7a/liblinphone.so
index 33932c12b..b560ffc09 100755
Binary files a/libs/armeabi-v7a/liblinphone.so and b/libs/armeabi-v7a/liblinphone.so differ
diff --git a/submodules/externals/build/ffmpeg/Android.mk b/submodules/externals/build/ffmpeg/Android.mk
index c6907ec7c..d4c5f3df5 100755
--- a/submodules/externals/build/ffmpeg/Android.mk
+++ b/submodules/externals/build/ffmpeg/Android.mk
@@ -1,3 +1,5 @@
 include  $(root-dir)/submodules/externals/build/ffmpeg/Android_libavutil.mk
 include  $(root-dir)/submodules/externals/build/ffmpeg/Android_libavcodec.mk
-include  $(root-dir)/submodules/externals/build/ffmpeg/Android_libswscale.mk
\ No newline at end of file
+include  $(root-dir)/submodules/externals/build/ffmpeg/Android_libswscale.mk
+include  $(root-dir)/submodules/externals/build/ffmpeg/Android_libavcore.mk
+
diff --git a/submodules/externals/build/ffmpeg/Android_libavcodec.mk b/submodules/externals/build/ffmpeg/Android_libavcodec.mk
index 3d483e8ed..a9c817982 100755
--- a/submodules/externals/build/ffmpeg/Android_libavcodec.mk
+++ b/submodules/externals/build/ffmpeg/Android_libavcodec.mk
@@ -14,6 +14,7 @@ LOCAL_SRC_FILES = \
 	libavcodec/arm/dsputil_init_neon.c \
 	libavcodec/arm/dsputil_init_vfp.c \
 	libavcodec/arm/dsputil_neon.S.neon \
+	libavcodec/arm/dsputil_vfp.S.neon \
 	libavcodec/arm/fft_init_arm.c \
 	libavcodec/arm/h264dsp_init_arm.c \
 	libavcodec/arm/h264dsp_neon.S.neon \
@@ -80,7 +81,8 @@ LOCAL_SRC_FILES = \
 	libavcodec/resample.c \
 	libavcodec/resample2.c \
 	libavcodec/simple_idct.c \
-	libavcodec/utils.c 
+	libavcodec/utils.c \
+	libavcodec/pthread.c
 
 
 #LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H -Wa,-I$(LOCAL_PATH)/libavcodec/arm
diff --git a/submodules/externals/build/ffmpeg/Android_libavcore.mk b/submodules/externals/build/ffmpeg/Android_libavcore.mk
new file mode 100644
index 000000000..82a180f77
--- /dev/null
+++ b/submodules/externals/build/ffmpeg/Android_libavcore.mk
@@ -0,0 +1,21 @@
+
+LOCAL_PATH:= $(call my-dir)/../../ffmpeg/
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libavcore
+
+
+LOCAL_SRC_FILES := \
+	libavcore/imgutils.c \
+	libavcore/parseutils.c \
+	libavcore/utils.c
+
+
+LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
+
+
+
+#for including config.h:
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg  $(LOCAL_PATH)/
+include $(BUILD_STATIC_LIBRARY)
+
diff --git a/submodules/externals/build/ffmpeg/config.h b/submodules/externals/build/ffmpeg/config.h
index f0b1594dd..bfd1ec95c 100644
--- a/submodules/externals/build/ffmpeg/config.h
+++ b/submodules/externals/build/ffmpeg/config.h
@@ -109,7 +109,7 @@
 #define HAVE_MEMALIGN 1
 #define HAVE_MKSTEMP 1
 #define HAVE_PLD 1
-#define HAVE_POSIX_MEMALIGN 1
+#define HAVE_POSIX_MEMALIGN 0
 #define HAVE_ROUND 1
 #define HAVE_ROUNDF 1
 #define HAVE_SDL 0
diff --git a/submodules/linphone b/submodules/linphone
index f3db122cd..dea7a7661 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit f3db122cd03bf836afbdbb3cecf17e648a0ceb13
+Subproject commit dea7a7661cbf7e95e476a7ddd9bf5449e3093c40