Commit 53f7cedf authored by Sylvain Berfini's avatar Sylvain Berfini
Browse files

Updated ms2 and android build to use renamed ffmepg libraries

parent ddf2dcc4
......@@ -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
......
......@@ -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
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment