From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 21 Oct 2011 14:02:52 +0000 (+0200)
Subject: add silk for IOS
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=64a23f9b67cab8aa0f4cac22211722d1fa9e3716

add silk for IOS
---

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 7f706cc8..7e3a1f26 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1043,7 +1043,11 @@ static void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vta
 	linphone_core_assign_payload_type(lc,&payload_type_aal2_g726_24,-1,NULL);
 	linphone_core_assign_payload_type(lc,&payload_type_aal2_g726_32,-1,NULL);
 	linphone_core_assign_payload_type(lc,&payload_type_aal2_g726_40,-1,NULL);
-
+	linphone_core_assign_payload_type(lc,&payload_type_silk_nb,-1,NULL);
+	linphone_core_assign_payload_type(lc,&payload_type_silk_mb,-1,NULL);
+	linphone_core_assign_payload_type(lc,&payload_type_silk_wb,-1,NULL);
+	linphone_core_assign_payload_type(lc,&payload_type_silk_swb,-1,NULL);
+	
 	ms_init();
 	/* create a mediastreamer2 event queue and set it as global */
 	/* This allows to run event's callback in linphone_core_iterate() */
diff --git a/mediastreamer2 b/mediastreamer2
index 084ac9a2..f77b325c 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 084ac9a21334d3f91d51666a36bf9f717741f23d
+Subproject commit f77b325c2aa7068adaa5a0c7353b99056732ca48
diff --git a/oRTP b/oRTP
index d1ca9b6c..76062079 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit d1ca9b6c5fbcaafa59299dc1a5f790bb92dc4e6e
+Subproject commit 7606207905bd3dc661e68576097adce471916697