diff --git a/build/android/Android-no-neon.mk b/build/android/Android-no-neon.mk
index 39818fbf4..c1f9e7f05 100644
--- a/build/android/Android-no-neon.mk
+++ b/build/android/Android-no-neon.mk
@@ -27,10 +27,10 @@ include $(linphone-root-dir)/submodules/linphone/build/android/common.mk
 
 ifeq ($(LINPHONE_VIDEO),1)
 LOCAL_SHARED_LIBRARIES += \
-	libavcodecnoneon \
-	libswscale \
-	libavcore \
-	libavutil
+	liblinavcodecnoneon \
+	liblinswscale \
+	liblinavcore \
+	liblinavutil
 endif
 
 LOCAL_MODULE := liblinphonenoneon
diff --git a/build/android/Android.mk b/build/android/Android.mk
index 0dc0bd041..645676ffc 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -27,10 +27,10 @@ include $(linphone-root-dir)/submodules/linphone/build/android/common.mk
 
 ifeq ($(LINPHONE_VIDEO),1)
 LOCAL_SHARED_LIBRARIES += \
-	libavcodec \
-	libswscale \
-	libavcore \
-	libavutil
+	liblinavcodec \
+	liblinswscale \
+	liblinavcore \
+	liblinavutil
 endif
 
 LOCAL_MODULE := liblinphone
diff --git a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
index b3c638b68..e757389c9 100644
--- a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -40,19 +40,19 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 
 	static {
 		// FFMPEG (audio/video)
-		loadOptionalLibrary("avutil");
-		loadOptionalLibrary("swscale");
-		loadOptionalLibrary("avcore");
+		loadOptionalLibrary("linavutil");
+		loadOptionalLibrary("linswscale");
+		loadOptionalLibrary("linavcore");
 
 		System.loadLibrary("neon");
 		
 		if (!hasNeonInCpuFeatures()) {
-			boolean noNeonLibrariesLoaded = loadOptionalLibrary("avcodecnoneon");
+			boolean noNeonLibrariesLoaded = loadOptionalLibrary("linavcodecnoneon");
 			if (!noNeonLibrariesLoaded) {
-				loadOptionalLibrary("avcodec");
+				loadOptionalLibrary("linavcodec");
 			}
 		} else {
-			loadOptionalLibrary("avcodec");
+			loadOptionalLibrary("linavcodec");
 		}
  
 		// OPENSSL (cryptography)
diff --git a/mediastreamer2 b/mediastreamer2
index 053603969..407d6591e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 05360396963de551078d3465ea8e5a8fa09c1cf2
+Subproject commit 407d6591e14bf90816b88e7615408230136b3de5