From 4372a0ecd6504a1e1f54c2a6e20b82a627d908f9 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 6 Dec 2013 13:10:24 +0100
Subject: [PATCH] remove cpu count detection from app, since it is done
 automatically by mediastreamer2 now. update belle sip and linphone

---
 Classes/LinphoneManager.m | 3 ---
 submodules/belle-sip      | 2 +-
 submodules/linphone       | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 7aea4c223..e1804a24b 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -922,9 +922,6 @@ static LinphoneCoreVTable linphonec_vtable = {
 			
 		}
 
-    NSUInteger cpucount = [[NSProcessInfo processInfo] processorCount];
-	ms_set_cpu_count(cpucount);
-
 	if (![LinphoneManager isNotIphone3G]){
 		PayloadType *pt=linphone_core_find_payload_type(theLinphoneCore,"SILK",24000,-1);
 		if (pt) {
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 38225cd88..0cf4dede9 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 38225cd88dfd1feeccd15fa88d42fb2261964a61
+Subproject commit 0cf4dede9e1f53e9a6b1bfdc329cef283bcb6022
diff --git a/submodules/linphone b/submodules/linphone
index fa16748aa..2fa2ab905 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit fa16748aa61f402489d1fd1f4ebd5d3bdcb3bc4f
+Subproject commit 2fa2ab9056e98f0664fce05f88590015231a2571