witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Updated ms2 and android build to use renamed ffmepg libraries

Browse source
This commit is contained in:
Sylvain Berfini 2013-07-11 13:36:56 +02:00
parent ddf2dcc409
commit 53f7cedf00
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/android/Android-no-neon.mk
View file

@ -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

8
build/android/Android.mk
View file

@ -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

12
java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
View file

@ -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)