shithub: openh264

Download patch

ref: 5c5a2332575268fa5e5089a3e584bee4741f8ec9
parent: e4a9c7f8e41b1ffd2fefe6f91b65e4f74b316349
parent: b4fdfa64af3ea224227b8fee79f0d3f486974f5d
author: Ethan Hugg <[email protected]>
date: Sun May 4 11:19:51 EDT 2014 

Merge pull request #784 from mstorsjo/renamed-lib

Take the new external library name in use, fix building for android


--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -38,7 +38,7 @@
 CFLAGS += -DLINUX -DANDROID_NDK -fpic --sysroot=$(SYSROOT)
 CXXFLAGS += -fno-rtti -fno-exceptions
 LDFLAGS += --sysroot=$(SYSROOT)
-SHLDFLAGS = -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-soname,libwels.so
+SHLDFLAGS = -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-soname,lib$(PROJECT_NAME).so
 
 STL_INCLUDES = \
     -I$(NDKROOT)/sources/cxx-stl/stlport/stlport
--- a/build/platform-msvc-common.mk
+++ b/build/platform-msvc-common.mk
@@ -33,5 +33,5 @@
 OBJ=obj
 SHAREDLIBSUFFIX=dll
 SHARED=-LD
-SHLDFLAGS=-link -def:wels.def -implib:wels_dll.lib
-EXTRA_LIBRARY=wels_dll.lib
+SHLDFLAGS=-link -def:openh264.def -implib:$(PROJECT_NAME)_dll.lib
+EXTRA_LIBRARY=$(PROJECT_NAME)_dll.lib
--- a/codec/build/android/dec/jni/welsdecdemo.mk
+++ b/codec/build/android/dec/jni/welsdecdemo.mk
@@ -3,7 +3,7 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE    := wels
-LOCAL_SRC_FILES := ../../../../../libwels.so
+LOCAL_SRC_FILES := ../../../../../libopenh264.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 
--- a/codec/build/android/dec/src/com/wels/dec/WelsDecTest.java
+++ b/codec/build/android/dec/src/com/wels/dec/WelsDecTest.java
@@ -104,7 +104,7 @@
     private static final String TAG = "welsdec";
     static {
         try {
-            System.loadLibrary("wels");
+            System.loadLibrary("openh264");
             System.loadLibrary("stlport_shared");
             System.loadLibrary("welsdecdemo");
             Log.v(TAG, "Load libwelsdec successful");
--- a/codec/build/android/enc/jni/welsencdemo.mk
+++ b/codec/build/android/enc/jni/welsencdemo.mk
@@ -3,7 +3,7 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE    := wels
-LOCAL_SRC_FILES := ../../../../../libwels.so
+LOCAL_SRC_FILES := ../../../../../libopenh264.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 
--- a/codec/build/android/enc/src/com/wels/enc/WelsEncTest.java
+++ b/codec/build/android/enc/src/com/wels/enc/WelsEncTest.java
@@ -104,7 +104,7 @@
     private static final String TAG = "welsenc";
     static {
         try {
-            System.loadLibrary("wels");
+            System.loadLibrary("openh264");
             System.loadLibrary("stlport_shared");
             System.loadLibrary("welsencdemo");
             Log.v(TAG, "Load libwelsencdemo.so successful");
--- /dev/null
+++ b/openh264.def
@@ -1,0 +1,5 @@
+EXPORTS
+	WelsCreateDecoder
+	WelsDestroyDecoder
+	WelsCreateSVCEncoder
+	WelsDestroySVCEncoder
--- a/wels.def
+++ /dev/null
@@ -1,5 +1,0 @@
-EXPORTS
-	WelsCreateDecoder
-	WelsDestroyDecoder
-	WelsCreateSVCEncoder
-	WelsDestroySVCEncoder