From 482484e27d6c2fd93495991cc3b26ff1278bc64d Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Thu, 11 Jul 2013 13:42:23 +0200
Subject: [PATCH] Renamed ffmepg libraries to force Android to use ours in case
 the device embed it's own ffmepg

Conflicts:
	submodules/linphone
---
 jni/Application.mk                                            | 4 ++--
 .../externals/build/ffmpeg-no-neon/Android_libavcodec.mk      | 4 ++--
 submodules/externals/build/ffmpeg/Android_libavcodec.mk       | 4 ++--
 submodules/externals/build/ffmpeg/Android_libavcore.mk        | 4 ++--
 submodules/externals/build/ffmpeg/Android_libavutil.mk        | 2 +-
 submodules/externals/build/ffmpeg/Android_libswscale.mk       | 4 ++--
 submodules/linphone                                           | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/jni/Application.mk b/jni/Application.mk
index 7dfa25a22..a2c7ff6fb 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -24,8 +24,8 @@ BUILD_SRTP=1
 endif
 
 ifeq ($(LINPHONE_VIDEO),1)
-APP_MODULES += libavutil libavcore libavcodec libswscale
-APP_MODULES += libavutilnoneon libavcorenoneon libavcodecnoneon libswscalenoneon
+APP_MODULES += liblinavutil liblinavcore liblinavcodec liblinswscale
+APP_MODULES += liblinavcodecnoneon
 APP_MODULES += libvpx
 endif
 
diff --git a/submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk b/submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk
index 5c558ea3b..c6a84e3c0 100755
--- a/submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk
+++ b/submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH:= $(call my-dir)/../../ffmpeg
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libavcodecnoneon
+LOCAL_MODULE := liblinavcodecnoneon
 
 LOCAL_SRC_FILES = \
 	libavcodec/allcodecs.c \
@@ -104,7 +104,7 @@ LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/ \
 	$(LOCAL_PATH)/libavutil 
 
-LOCAL_SHARED_LIBRARIES := libavutil libavcore
+LOCAL_SHARED_LIBRARIES := liblinavutil liblinavcore
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/submodules/externals/build/ffmpeg/Android_libavcodec.mk b/submodules/externals/build/ffmpeg/Android_libavcodec.mk
index dab39a7e8..0fdce0ed0 100755
--- a/submodules/externals/build/ffmpeg/Android_libavcodec.mk
+++ b/submodules/externals/build/ffmpeg/Android_libavcodec.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH:= $(call my-dir)/../../ffmpeg
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libavcodec
+LOCAL_MODULE := liblinavcodec
 
 LOCAL_SRC_FILES = \
 	libavcodec/allcodecs.c \
@@ -104,7 +104,7 @@ LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/ \
 	$(LOCAL_PATH)/libavutil 
 
-LOCAL_SHARED_LIBRARIES := libavutil libavcore
+LOCAL_SHARED_LIBRARIES := liblinavutil liblinavcore
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/submodules/externals/build/ffmpeg/Android_libavcore.mk b/submodules/externals/build/ffmpeg/Android_libavcore.mk
index 27982d535..350eb343e 100644
--- a/submodules/externals/build/ffmpeg/Android_libavcore.mk
+++ b/submodules/externals/build/ffmpeg/Android_libavcore.mk
@@ -2,7 +2,7 @@
 LOCAL_PATH:= $(call my-dir)/../../ffmpeg/
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libavcore
+LOCAL_MODULE := liblinavcore
 
 
 LOCAL_SRC_FILES := \
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
 #for including config.h:
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg  $(LOCAL_PATH)/
 
-LOCAL_SHARED_LIBRARIES := libavutil
+LOCAL_SHARED_LIBRARIES := liblinavutil
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/submodules/externals/build/ffmpeg/Android_libavutil.mk b/submodules/externals/build/ffmpeg/Android_libavutil.mk
index 1cf6c7e1f..837028f41 100755
--- a/submodules/externals/build/ffmpeg/Android_libavutil.mk
+++ b/submodules/externals/build/ffmpeg/Android_libavutil.mk
@@ -2,7 +2,7 @@
 LOCAL_PATH:= $(call my-dir)/../../ffmpeg/
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libavutil
+LOCAL_MODULE := liblinavutil
 
 
 LOCAL_SRC_FILES = \
diff --git a/submodules/externals/build/ffmpeg/Android_libswscale.mk b/submodules/externals/build/ffmpeg/Android_libswscale.mk
index 48aa2dad8..f3f7492d5 100755
--- a/submodules/externals/build/ffmpeg/Android_libswscale.mk
+++ b/submodules/externals/build/ffmpeg/Android_libswscale.mk
@@ -2,7 +2,7 @@
 LOCAL_PATH:= $(call my-dir)/../../ffmpeg/libswscale/
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libswscale
+LOCAL_MODULE := liblinswscale
 
 LOCAL_SRC_FILES = \
 	options.c \
@@ -20,7 +20,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../build/ffmpeg  \
 					$(LOCAL_PATH)/ \
 					$(LOCAL_PATH)/../
 
-LOCAL_SHARED_LIBRARIES := libavutil
+LOCAL_SHARED_LIBRARIES := liblinavutil
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/submodules/linphone b/submodules/linphone
index 2372467ac..53f7cedf0 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 2372467ac6a30d1e1a4355679b7ba4476bce65dc
+Subproject commit 53f7cedf0047ee73d5f0d2c823dfbe1297322cab