From 754c5bb6891a8ce16ba7877c1a2fbcccab7c7534 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 30 Jun 2010 09:51:47 +0200
Subject: [PATCH] add ilbc to android

---
 coreapi/linphonecore_jni.cc | 4 +++-
 mediastreamer2              | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 3a5511a00..958170e24 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -161,9 +161,11 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv*
 	LinphoneCoreData* ldata = new LinphoneCoreData(env,thiz,jlistener,juserdata);
 #ifdef ANDROID
 	ms_andsnd_register_card(jvm);
-	// requires an fpu libmsilbc_init();
 #endif /*ANDROID*/
 
+#ifdef HAVE_ILBC
+	libmsilbc_init(); // requires an fpu
+#endif
 	jlong nativePtr = (jlong)linphone_core_new(	&ldata->vTable
 			,userConfig
 			,factoryConfig
diff --git a/mediastreamer2 b/mediastreamer2
index 5267b9b3e..adc5516c1 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 5267b9b3e66519a17d75735e65ae0534ebfe3ff1
+Subproject commit adc5516c11707314ae5e17bb5fcd32373710f510