diff --git a/Makefile b/Makefile
index d64fdae9a..7a21b6e59 100644
--- a/Makefile
+++ b/Makefile
@@ -119,9 +119,9 @@ prepare-ilbc: $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c
 
 #ffmpeg
 ifeq ($(BUILD_VIDEO),1)
-BUILD_FFMPEG_DEPS=$(FFMPEG_SRC_DIR)/non_versioned_soname_patch_applied.txt $(FFMPEG_BUILD_DIR)/arm/libavcodec/libavcodec-linphone-arm.so
+BUILD_FFMPEG_DEPS=$(FFMPEG_SRC_DIR)/non_versioned_soname_patch_applied.txt $(FFMPEG_BUILD_DIR)/arm/libffmpeg-linphone-arm.so
 ifeq ($(BUILD_FOR_X86), 1)
-	BUILD_FFMPEG_DEPS+=$(FFMPEG_BUILD_DIR)/x86/libavcodec/libavcodec-linphone-x86.so
+	BUILD_FFMPEG_DEPS+=$(FFMPEG_BUILD_DIR)/x86/libffmpeg-linphone-x86.so
 endif
 endif
 FFMPEG_SRC_DIR=$(TOPDIR)/submodules/externals/ffmpeg
@@ -131,7 +131,7 @@ FFMPEG_CONFIGURE_OPTIONS=--target-os=linux --enable-cross-compile --enable-runti
 	--disable-avdevice --disable-avfilter --disable-avformat --disable-swresample --disable-network \
 	--enable-decoder=mjpeg --enable-encoder=mjpeg --enable-decoder=mpeg4 --enable-encoder=mpeg4 --enable-decoder=h264 \
 	--enable-decoder=h263p --enable-encoder=h263p --enable-decoder=h263 --enable-encoder=h263\
-	--disable-static --enable-shared
+	--disable-static --enable-shared --disable-symver
 FFMPEG_ARM_CONFIGURE_OPTIONS=--build-suffix=-linphone-arm --arch=arm --sysroot=$(ARM_SYSROOT) --cross-prefix=$(ARM_TOOLCHAIN_PATH) --enable-pic
 FFMPEG_X86_CONFIGURE_OPTIONS=--build-suffix=-linphone-x86 --arch=x86 --sysroot=$(X86_SYSROOT) --cross-prefix=$(X86_TOOLCHAIN_PATH) --disable-mmx --disable-sse2 --disable-ssse3 --extra-cflags='-O3'
 
@@ -151,6 +151,11 @@ $(FFMPEG_BUILD_DIR)/arm/libavcodec/libavcodec-linphone-arm.so: $(FFMPEG_BUILD_DI
 	make -j ${NUMCPUS} \
 	|| ( echo "Build of ffmpeg for arm failed." ; exit 1 )
 
+$(FFMPEG_BUILD_DIR)/arm/libffmpeg-linphone-arm.so: $(FFMPEG_BUILD_DIR)/arm/libavcodec/libavcodec-linphone-arm.so
+	cd $(FFMPEG_BUILD_DIR)/arm && \
+	rm libavcodec/log2_tab.o && \
+	$(ARM_TOOLCHAIN_PATH)gcc -lm -lz --sysroot=$(ARM_SYSROOT) -Wl,--no-undefined -Wl,-z,noexecstack -shared libavutil/*.o libavutil/arm/*.o libavcodec/*.o libavcodec/arm/*.o libswscale/*.o -o libffmpeg-linphone-arm.so
+
 $(FFMPEG_BUILD_DIR)/x86/config.h:
 	mkdir -p $(FFMPEG_BUILD_DIR)/x86 && \
         cd $(FFMPEG_BUILD_DIR)/x86 && \
@@ -163,6 +168,11 @@ $(FFMPEG_BUILD_DIR)/x86/libavcodec/libavcodec-linphone-x86.so: $(FFMPEG_BUILD_DI
 	make -j ${NUMCPUS} \
 	|| ( echo "Build of ffmpeg for x86 failed." ; exit 1 )
 
+$(FFMPEG_BUILD_DIR)/x86/libffmpeg-linphone-x86.so: $(FFMPEG_BUILD_DIR)/x86/libavcodec/libavcodec-linphone-x86.so
+	cd $(FFMPEG_BUILD_DIR)/x86 && \
+	rm libavcodec/log2_tab.o && \
+	$(X86_TOOLCHAIN_PATH)gcc -lm -lz --sysroot=$(X86_SYSROOT) -Wl,--no-undefined -Wl,-z,noexecstack -shared libavutil/*.o libavutil/x86/*.o libavcodec/*.o libavcodec/x86/*.o libswscale/*.o -o  libffmpeg-linphone-x86.so
+
 build-ffmpeg: $(BUILD_FFMPEG_DEPS)
 
 clean-ffmpeg:
diff --git a/jni/Application.mk b/jni/Application.mk
index b9b66a9b9..d4a0793cb 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -57,7 +57,7 @@ endif
 endif
 
 ifeq ($(BUILD_VIDEO),1)
-APP_MODULES += libavutil-linphone libavcodec-linphone libswscale-linphone
+APP_MODULES += libffmpeg-linphone
 APP_MODULES += libvpx
 ifeq ($(BUILD_X264),1)
 APP_MODULES +=libx264 libmsx264
diff --git a/submodules/externals/build/ffmpeg/Android.mk b/submodules/externals/build/ffmpeg/Android.mk
index 750ca1c71..6d7257a03 100755
--- a/submodules/externals/build/ffmpeg/Android.mk
+++ b/submodules/externals/build/ffmpeg/Android.mk
@@ -1,3 +1,8 @@
-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
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libffmpeg-linphone
+LOCAL_MODULE_FILENAME := libffmpeg-linphone-$(TARGET_ARCH)
+LOCAL_SRC_FILES := $(TARGET_ARCH)/libffmpeg-linphone-$(TARGET_ARCH).so
+
+include $(PREBUILT_SHARED_LIBRARY)
diff --git a/submodules/linphone b/submodules/linphone
index cc5ec6319..52312c036 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit cc5ec63197fba457f66f1d589fc27dddd4e7ed0b
+Subproject commit 52312c0361290bab0c955f134e660ab44220ca85