From 8f470e1ea8b4494500dae8c811fcb75ca2cb2e7c Mon Sep 17 00:00:00 2001
From: Zhang Rui <bbcallen@gmail.com>
Date: Wed, 25 Jun 2014 11:02:06 +0800
Subject: [PATCH] android: rename libffmpeg.so to libijkffmpeg.so to avoid
 possible conflict

---
 android/ijkmediaplayer/jni/ffmpeg/Android.mk   |  4 ++--
 .../ijk/media/player/IjkMediaPlayer.java       |  2 +-
 android/tools/do-compile-ffmpeg.sh             | 18 +++++++-----------
 ijkmedia/ijkplayer/Android.mk                  |  2 +-
 ijkmedia/ijksdl/Android.mk                     |  2 +-
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/android/ijkmediaplayer/jni/ffmpeg/Android.mk b/android/ijkmediaplayer/jni/ffmpeg/Android.mk
index 49991883..ec33908f 100644
--- a/android/ijkmediaplayer/jni/ffmpeg/Android.mk
+++ b/android/ijkmediaplayer/jni/ffmpeg/Android.mk
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := ffmpeg
-LOCAL_SRC_FILES := $(MY_APP_FFMPEG_OUTPUT_PATH)/libffmpeg.so
+LOCAL_MODULE := ijkffmpeg
+LOCAL_SRC_FILES := $(MY_APP_FFMPEG_OUTPUT_PATH)/libijkffmpeg.so
 include $(PREBUILT_SHARED_LIBRARY)
\ No newline at end of file
diff --git a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaPlayer.java b/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaPlayer.java
index 8507630a..630a087f 100644
--- a/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaPlayer.java
+++ b/android/ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaPlayer.java
@@ -85,7 +85,7 @@ public final class IjkMediaPlayer extends SimpleMediaPlayer {
         synchronized (IjkMediaPlayer.class) {
             if (!mIsLibLoaded) {
                 System.loadLibrary("stlport_shared");
-                System.loadLibrary("ffmpeg");
+                System.loadLibrary("ijkffmpeg");
                 System.loadLibrary("ijkutil");
                 System.loadLibrary("ijksdl");
                 System.loadLibrary("ijkplayer");
diff --git a/android/tools/do-compile-ffmpeg.sh b/android/tools/do-compile-ffmpeg.sh
index 39901882..405dc6a5 100755
--- a/android/tools/do-compile-ffmpeg.sh
+++ b/android/tools/do-compile-ffmpeg.sh
@@ -252,11 +252,7 @@ $CC -lm -lz -shared --sysroot=$FF_SYSROOT -Wl,--no-undefined -Wl,-z,noexecstack
     libswscale/*.o \
     $FF_ASM_OBJ_DIR \
     $FF_DEP_LIBS \
-    -o $FF_PREFIX/libffmpeg.so
-
-cp $FF_PREFIX/libffmpeg.so $FF_PREFIX/libffmpeg-debug.so
-cp $FF_PREFIX/libffmpeg.so $FF_PREFIX/libffmpeg-release.so
-$STRIP --strip-unneeded $FF_PREFIX/libffmpeg-release.so
+    -o $FF_PREFIX/libijkffmpeg.so
 
 function mysedi() {
     f=$1
@@ -273,7 +269,7 @@ echo "--------------------"
 rm -rf $FF_PREFIX/shared
 mkdir -p $FF_PREFIX/shared/lib/pkgconfig
 ln -s $FF_PREFIX/include $FF_PREFIX/shared/include
-ln -s $FF_PREFIX/libffmpeg.so $FF_PREFIX/shared/lib/libffmpeg.so
+ln -s $FF_PREFIX/libijkffmpeg.so $FF_PREFIX/shared/lib/libijkffmpeg.so
 cp $FF_PREFIX/lib/pkgconfig/*.pc $FF_PREFIX/shared/lib/pkgconfig
 for f in $FF_PREFIX/lib/pkgconfig/*.pc; do
     # in case empty dir
@@ -284,9 +280,9 @@ for f in $FF_PREFIX/lib/pkgconfig/*.pc; do
     f=$FF_PREFIX/shared/lib/pkgconfig/`basename $f`
     # OSX sed doesn't have in-place(-i)
     mysedi $f 's/\/output/\/output\/shared/g'
-    mysedi $f 's/-lavcodec/-lffmpeg/g'
-    mysedi $f 's/-lavformat/-lffmpeg/g'
-    mysedi $f 's/-lavutil/-lffmpeg/g'
-    mysedi $f 's/-lswresample/-lffmpeg/g'
-    mysedi $f 's/-lswscale/-lffmpeg/g'
+    mysedi $f 's/-lavcodec/-lijkffmpeg/g'
+    mysedi $f 's/-lavformat/-lijkffmpeg/g'
+    mysedi $f 's/-lavutil/-lijkffmpeg/g'
+    mysedi $f 's/-lswresample/-lijkffmpeg/g'
+    mysedi $f 's/-lswscale/-lijkffmpeg/g'
 done
diff --git a/ijkmedia/ijkplayer/Android.mk b/ijkmedia/ijkplayer/Android.mk
index 9ce3915c..e2113bc3 100644
--- a/ijkmedia/ijkplayer/Android.mk
+++ b/ijkmedia/ijkplayer/Android.mk
@@ -34,7 +34,7 @@ LOCAL_SRC_FILES += ijkplayer.c
 LOCAL_SRC_FILES += android/ijkplayer_android.c
 LOCAL_SRC_FILES += android/ijkplayer_jni.c
 
-LOCAL_SHARED_LIBRARIES := ffmpeg ijkutil ijksdl
+LOCAL_SHARED_LIBRARIES := ijkffmpeg ijkutil ijksdl
 
 LOCAL_MODULE := ijkplayer
 include $(BUILD_SHARED_LIBRARY)
diff --git a/ijkmedia/ijksdl/Android.mk b/ijkmedia/ijksdl/Android.mk
index 97ebe366..dd150f48 100644
--- a/ijkmedia/ijksdl/Android.mk
+++ b/ijkmedia/ijksdl/Android.mk
@@ -56,7 +56,7 @@ LOCAL_SRC_FILES += android/ijksdl_aout_android_audiotrack.c
 LOCAL_SRC_FILES += android/ijksdl_vout_android_nativewindow.c
 LOCAL_SRC_FILES += android/ijksdl_vout_android_surface.c
 
-LOCAL_SHARED_LIBRARIES := ffmpeg ijkutil
+LOCAL_SHARED_LIBRARIES := ijkffmpeg ijkutil
 LOCAL_STATIC_LIBRARIES := cpufeatures yuv_static
 
 LOCAL_MODULE := ijksdl
-- 
GitLab