Commit 5cdf2910 authored by Simon Morlat's avatar Simon Morlat
Browse files

add msx264 compilation

parent 7107aa1d
......@@ -86,7 +86,9 @@ LOCAL_STATIC_LIBRARIES += \
libswscale \
libavcore \
libavutil \
libmsx264 \
libx264
endif
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
......
......@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef ANDROID
#include <android/log.h>
extern "C" void libmsilbc_init();
extern "C" void libmsx264_init();
#endif /*ANDROID*/
extern "C" void ms_andsnd_set_jvm(JavaVM *jvm) ;
......@@ -48,7 +49,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *ajvm, void *reserved)
#ifdef ANDROID
ms_andsnd_set_jvm(ajvm);
#ifdef VIDEO_ENABLED
ms_andvid_set_jvm(ajvm);
ms_andvid_set_jvm(ajvm);
#endif /*VIDEO_ENABLED*/
#endif /*ANDROID*/
jvm=ajvm;
......@@ -312,6 +313,9 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv*
#ifdef HAVE_ILBC
libmsilbc_init(); // requires an fpu
#endif
#ifdef VIDEO_ENABLED
libmsx264_init();
#endif
jlong nativePtr = (jlong)linphone_core_new( &ldata->vTable
,userConfig
......
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