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

Fix compilation with ndk 10c

Browse source
This commit is contained in:
Sylvain Berfini 2014-11-07 15:15:57 +01:00
parent d551c1282a
commit 52312c0361
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/android/Android.mk
View file

@ -256,9 +256,7 @@ LOCAL_EXPORT_CFLAGS := $(LOCAL_CFLAGS)
ifeq ($(_BUILD_VIDEO),1)
LOCAL_SHARED_LIBRARIES += \
libavcodec-linphone \
libswscale-linphone \
libavutil-linphone
libffmpeg-linphone
endif
LOCAL_MODULE := liblinphone

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

@ -48,13 +48,9 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
// FFMPEG (audio/video)
if (Version.isX86()) {
loadOptionalLibrary("avutil-linphone-x86");
loadOptionalLibrary("swscale-linphone-x86");
loadOptionalLibrary("avcodec-linphone-x86");
loadOptionalLibrary("ffmpeg-linphone-x86");
} else if (Version.isArmv7()) {
loadOptionalLibrary("avutil-linphone-arm");
loadOptionalLibrary("swscale-linphone-arm");
loadOptionalLibrary("avcodec-linphone-arm");
loadOptionalLibrary("ffmpeg-linphone-arm");
}
//Main library