diff --git a/build/android/Android.mk b/build/android/Android.mk
index c281b241d..cb4b703f4 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -256,9 +256,7 @@ LOCAL_EXPORT_CFLAGS := $(LOCAL_CFLAGS)
 
 ifeq ($(_BUILD_VIDEO),1)
 LOCAL_SHARED_LIBRARIES += \
-	libavcodec-linphone \
-	libswscale-linphone \
-	libavutil-linphone
+	libffmpeg-linphone
 endif
 
 LOCAL_MODULE := liblinphone
diff --git a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
index f0d3ae064..2bf7b6245 100644
--- a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -48,13 +48,9 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 
 		// FFMPEG (audio/video)
 		if (Version.isX86()) {
-			loadOptionalLibrary("avutil-linphone-x86");
-			loadOptionalLibrary("swscale-linphone-x86");
-			loadOptionalLibrary("avcodec-linphone-x86");
+			loadOptionalLibrary("ffmpeg-linphone-x86");
 		} else if (Version.isArmv7()) {
-			loadOptionalLibrary("avutil-linphone-arm");
-			loadOptionalLibrary("swscale-linphone-arm");
-			loadOptionalLibrary("avcodec-linphone-arm");
+			loadOptionalLibrary("ffmpeg-linphone-arm");
 		}
 
 		//Main library