From 5e6098e14f7885250e587dd4b441b5897f64bcdf Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 20 Mar 2013 15:48:04 +0100
Subject: [PATCH 01/31] Activate ICE when configuring a linphone.org account
 with the wizard.

---
 Resources/linphonerc-factory      | 2 +-
 Resources/linphonerc-factory~ipad | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory
index 0025fff93..e16499cd6 100644
--- a/Resources/linphonerc-factory
+++ b/Resources/linphonerc-factory
@@ -42,6 +42,6 @@ expires=604800
 push_notification=1
 transport=tls
 sharing_server=https://www.linphone.org:444/upload.php
-ice=0
+ice=1
 stun=stun.linphone.org
 
diff --git a/Resources/linphonerc-factory~ipad b/Resources/linphonerc-factory~ipad
index fac1148f1..e9e636be0 100644
--- a/Resources/linphonerc-factory~ipad
+++ b/Resources/linphonerc-factory~ipad
@@ -42,5 +42,5 @@ expires=604800
 push_notification=1
 transport=tls
 sharing_server=https://www.linphone.org:444/upload.php
-ice=0
+ice=1
 stun=stun.linphone.org

From 453f5bf5c42d32c2c18630c23e2c2fc266e4d16b Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 21 Mar 2013 14:16:02 +0100
Subject: [PATCH 02/31] Fix call transfer to an email address.

---
 Classes/LinphoneManager.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index d2674539d..5f7cbee8a 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -1294,7 +1294,7 @@ static void audioRouteChangeListenerCallback (
             linphone_address_set_display_name(linphoneAddress, [displayName cStringUsingEncoding:[NSString defaultCStringEncoding]]);
         }
         if(transfer) {
-            linphone_core_transfer_call(theLinphoneCore, linphone_core_get_current_call(theLinphoneCore), normalizedUserName);
+            linphone_core_transfer_call(theLinphoneCore, linphone_core_get_current_call(theLinphoneCore), linphone_address_as_string_uri_only(linphoneAddress));
         } else {
             call=linphone_core_invite_address_with_params(theLinphoneCore, linphoneAddress, lcallParams);
         }

From 151efc7d715a15959d1ec44a5ae905b783731770 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 29 Mar 2013 15:29:27 +0100
Subject: [PATCH 03/31] Do not use linphone_core_get_identity() when creating a
 LinphoneAddress to prevent a random port to appear.

---
 Classes/LinphoneCoreSettingsStore.m | 2 +-
 Classes/LinphoneManager.m           | 2 +-
 Classes/WizardViewController.m      | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index bb54f270f..3c82e864d 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -354,7 +354,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 		//possible valid config detected
 		proxyCfg = linphone_core_create_proxy_config(lc);
 		char normalizedUserName[256];
-		LinphoneAddress* linphoneAddress = linphone_address_new(linphone_core_get_identity(lc));
+		LinphoneAddress* linphoneAddress = linphone_address_new("sip:user@domain.com");
 		linphone_proxy_config_normalize_number(proxyCfg, [username cStringUsingEncoding:[NSString defaultCStringEncoding]], normalizedUserName, sizeof(normalizedUserName));
 		linphone_address_set_username(linphoneAddress, normalizedUserName);
 		linphone_address_set_domain(linphoneAddress, [domain cStringUsingEncoding:[NSString defaultCStringEncoding]]);
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 5f7cbee8a..768c7fcab 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -1287,7 +1287,7 @@ static void audioRouteChangeListenerCallback (
 		[error release];
 	} else {
 		char normalizedUserName[256];
-        LinphoneAddress* linphoneAddress = linphone_address_new(linphone_core_get_identity(theLinphoneCore));  
+        LinphoneAddress* linphoneAddress = linphone_address_new("sip:user@domain.com");  
 		linphone_proxy_config_normalize_number(proxyCfg,[address cStringUsingEncoding:[NSString defaultCStringEncoding]],normalizedUserName,sizeof(normalizedUserName));
         linphone_address_set_username(linphoneAddress, normalizedUserName);
         if(displayName!=nil) {
diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m
index 125a992b4..2b2be7e94 100644
--- a/Classes/WizardViewController.m
+++ b/Classes/WizardViewController.m
@@ -384,13 +384,12 @@ static UICompositeViewDescription *compositeDescription = nil;
 }
 
 - (void)addProxyConfig:(NSString*)username password:(NSString*)password domain:(NSString*)domain server:(NSString*)server {
-    LinphoneCore *lc = [LinphoneManager getLc];
     [self clearProxyConfig];
     if(server == nil) {
         server = domain;
     }
     char normalizedUserName[256];
-    LinphoneAddress* linphoneAddress = linphone_address_new(linphone_core_get_identity(lc));
+    LinphoneAddress* linphoneAddress = linphone_address_new("sip:user@domain.com");
     linphone_proxy_config_normalize_number(NULL, [username cStringUsingEncoding:[NSString defaultCStringEncoding]], normalizedUserName, sizeof(normalizedUserName));
     linphone_address_set_username(linphoneAddress, normalizedUserName);
     linphone_address_set_domain(linphoneAddress, [domain UTF8String]);
@@ -416,7 +415,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (NSString*)identityFromUsername:(NSString*)username {
     char normalizedUserName[256];
-    LinphoneAddress* linphoneAddress = linphone_address_new(linphone_core_get_identity([LinphoneManager getLc]));
+    LinphoneAddress* linphoneAddress = linphone_address_new("sip:user@domain.com");
     linphone_proxy_config_normalize_number(NULL, [username cStringUsingEncoding:[NSString defaultCStringEncoding]], normalizedUserName, sizeof(normalizedUserName));
     linphone_address_set_username(linphoneAddress, normalizedUserName);
     linphone_address_set_domain(linphoneAddress, [[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"wizard"] UTF8String]);

From d64ae49c5113fbf49e9b0b857650bf2a85b6c368 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 2 Apr 2013 10:25:18 +0200
Subject: [PATCH 04/31] Fix issue 000624: App crash when editing contact in
 address book.

Do not try to animate the email section of the contact details if it is not shown.
---
 Classes/ContactDetailsTableViewController.m | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m
index 1ac0bf331..8f49fd838 100644
--- a/Classes/ContactDetailsTableViewController.m
+++ b/Classes/ContactDetailsTableViewController.m
@@ -643,7 +643,8 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C
 #pragma mark - UITableViewDelegate Functions
 
 
-- (void)setEditing:(BOOL)editing animated:(BOOL)animated { 
+- (void)setEditing:(BOOL)editing animated:(BOOL)animated {
+    bool_t showEmails = [[LinphoneManager instance] lpConfigBoolForKey:@"show_contacts_emails_preference"];
     // Resign keyboard
     if(!editing) {
         [LinphoneUtils findAndResignFirstResponder:[self tableView]];
@@ -659,14 +660,14 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C
         for (int section = 0; section < [self numberOfSectionsInTableView:[self tableView]]; ++section) {
             if(contactSections[section] == ContactSections_Number ||
                contactSections[section] == ContactSections_Sip ||
-               contactSections[section] == ContactSections_Email)
+               (showEmails && contactSections[section] == ContactSections_Email))
             [self addEntry:self.tableView section:section animated:animated];
         }
     } else {
         for (int section = 0; section < [self numberOfSectionsInTableView:[self tableView]]; ++section) {
             if(contactSections[section] == ContactSections_Number ||
                contactSections[section] == ContactSections_Sip ||
-               contactSections[section] == ContactSections_Email)
+               (showEmails && contactSections[section] == ContactSections_Email))
             [self removeEmptyEntry:self.tableView section:section animated:animated];
         }
     }

From 221f3bcd8e3e3db6802952058fc10b99b9f64077 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 2 Apr 2013 10:47:35 +0200
Subject: [PATCH 05/31] Fix domain when performing an outgoing call without
 outgoing SIP proxy.

---
 Classes/LinphoneManager.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 768c7fcab..bb9dc1bce 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -1287,7 +1287,7 @@ static void audioRouteChangeListenerCallback (
 		[error release];
 	} else {
 		char normalizedUserName[256];
-        LinphoneAddress* linphoneAddress = linphone_address_new("sip:user@domain.com");  
+        LinphoneAddress* linphoneAddress = linphone_address_new(linphone_core_get_identity(theLinphoneCore));
 		linphone_proxy_config_normalize_number(proxyCfg,[address cStringUsingEncoding:[NSString defaultCStringEncoding]],normalizedUserName,sizeof(normalizedUserName));
         linphone_address_set_username(linphoneAddress, normalizedUserName);
         if(displayName!=nil) {

From 3eae0708740ba3101439155ee66751824c602865 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 2 Apr 2013 11:23:08 +0200
Subject: [PATCH 06/31] Start dtmf stream when all calls have ended.

This has the effect to be able to play DTMFs faster and also resets the audio route when using bluetooth. This allows the route selection to work correctly on next outgoing call.
---
 Classes/LinphoneManager.m | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index bb9dc1bce..5ee4f8e62 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -472,6 +472,8 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char
 			[self removeCTCallCenterCb];
             bluetoothAvailable = FALSE;
             bluetoothEnabled = FALSE;
+            /*IOS specific*/
+            linphone_core_start_dtmf_stream(theLinphoneCore);
 		}
 		if (incallBgTask) {
 			[[UIApplication sharedApplication]  endBackgroundTask:incallBgTask];

From 903e2af59e5f663634d425e39050b4c2a2fd88c7 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 4 Apr 2013 11:57:03 +0200
Subject: [PATCH 07/31] Add armv7s to the list of valid architectures for the
 liblinphone xcode project.

---
 submodules/liblinphone.xcodeproj/project.pbxproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj
index 1248357b9..a85ff2e50 100644
--- a/submodules/liblinphone.xcodeproj/project.pbxproj
+++ b/submodules/liblinphone.xcodeproj/project.pbxproj
@@ -2015,6 +2015,7 @@
 				);
 				PRODUCT_NAME = mediastreamer;
 				SKIP_INSTALL = YES;
+				VALID_ARCHS = "armv6 armv7 armv7s i386";
 			};
 			name = Debug;
 		};
@@ -2071,6 +2072,7 @@
 				);
 				PRODUCT_NAME = mediastreamer;
 				SKIP_INSTALL = YES;
+				VALID_ARCHS = "armv6 armv7 armv7s i386";
 			};
 			name = Release;
 		};
@@ -2127,6 +2129,7 @@
 				);
 				PRODUCT_NAME = mediastreamer;
 				SKIP_INSTALL = YES;
+				VALID_ARCHS = "armv6 armv7 armv7s i386";
 			};
 			name = DistributionAdhoc;
 		};

From 78f49148aea3040966534095e82f858403291e1d Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 4 Apr 2013 12:23:15 +0200
Subject: [PATCH 08/31] Increase version number.

---
 linphone-Info.plist | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linphone-Info.plist b/linphone-Info.plist
index b24ab61b5..6118fb186 100644
--- a/linphone-Info.plist
+++ b/linphone-Info.plist
@@ -42,7 +42,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.5.100</string>
+	<string>3.5.101</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -59,7 +59,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.0.2</string>
+	<string>2.0.3</string>
 	<key>NSMainNibFile</key>
 	<string>LinphoneApp</string>
 	<key>NSMainNibFile~ipad</key>

From 990a59791a2a292dda65c3649dd0cb0f1bad377d Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 4 Apr 2013 14:39:37 +0200
Subject: [PATCH 09/31] Update linphone submodule to prevent crash on video
 toggle.

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 71f31347f..125779185 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 71f31347fcddaa5f0e9e329a7320efe60bc7c281
+Subproject commit 12577918593030541fd4d7b12e5881347e0eafb4

From 3dfd10bbe011c0d8defcbc0713a587ce65bba542 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 5 Apr 2013 10:45:52 +0200
Subject: [PATCH 10/31] Fix crash when using a phone number as username in the
 wizard.

---
 Classes/WizardViewController.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m
index 2b2be7e94..bdd693925 100644
--- a/Classes/WizardViewController.m
+++ b/Classes/WizardViewController.m
@@ -388,13 +388,13 @@ static UICompositeViewDescription *compositeDescription = nil;
     if(server == nil) {
         server = domain;
     }
+	LinphoneProxyConfig* proxyCfg = linphone_core_create_proxy_config([LinphoneManager getLc]);
     char normalizedUserName[256];
     LinphoneAddress* linphoneAddress = linphone_address_new("sip:user@domain.com");
-    linphone_proxy_config_normalize_number(NULL, [username cStringUsingEncoding:[NSString defaultCStringEncoding]], normalizedUserName, sizeof(normalizedUserName));
+    linphone_proxy_config_normalize_number(proxyCfg, [username cStringUsingEncoding:[NSString defaultCStringEncoding]], normalizedUserName, sizeof(normalizedUserName));
     linphone_address_set_username(linphoneAddress, normalizedUserName);
     linphone_address_set_domain(linphoneAddress, [domain UTF8String]);
     const char* identity = linphone_address_as_string_uri_only(linphoneAddress);
-	LinphoneProxyConfig* proxyCfg = linphone_core_create_proxy_config([LinphoneManager getLc]);
 	LinphoneAuthInfo* info = linphone_auth_info_new([username UTF8String], NULL, [password UTF8String], NULL, NULL);
 	linphone_proxy_config_set_identity(proxyCfg, identity);
 	linphone_proxy_config_set_server_addr(proxyCfg, [server UTF8String]);

From 5e7c049641b6ec7b5bb54d59686ec74c8d516496 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 5 Apr 2013 15:56:06 +0200
Subject: [PATCH 11/31] update liblinphone because of bugfix for PUBLISH
 requests.

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 125779185..d630e0a99 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 12577918593030541fd4d7b12e5881347e0eafb4
+Subproject commit d630e0a99decbed3e9a5437b680801dd236beb40

From 614061db7f5af9099509cccd78400a3d6067e011 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 10 Apr 2013 11:32:20 +0200
Subject: [PATCH 12/31] Fix tutorials xcode project.

---
 .../hello-world.xcodeproj/project.pbxproj     | 108 ++++++++++++------
 1 file changed, 71 insertions(+), 37 deletions(-)

diff --git a/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj b/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj
index 2aa526a1c..9e5c2c61c 100755
--- a/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj
+++ b/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj
@@ -7,6 +7,35 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		154E1A941715638900A0D168 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A931715638900A0D168 /* libmediastreamer_base.a */; };
+		154E1A961715639A00A0D168 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */; };
+		154E1A981715642E00A0D168 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A971715642E00A0D168 /* libavutil.a */; };
+		154E1A9A1715644400A0D168 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A991715644400A0D168 /* libavcodec.a */; };
+		154E1A9C1715645F00A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; };
+		154E1A9D171564B500A0D168 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A991715644400A0D168 /* libavcodec.a */; };
+		154E1A9E171564B500A0D168 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A991715644400A0D168 /* libavcodec.a */; };
+		154E1A9F171564B600A0D168 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A991715644400A0D168 /* libavcodec.a */; };
+		154E1AA0171564BA00A0D168 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A971715642E00A0D168 /* libavutil.a */; };
+		154E1AA1171564BA00A0D168 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A971715642E00A0D168 /* libavutil.a */; };
+		154E1AA2171564BA00A0D168 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A971715642E00A0D168 /* libavutil.a */; };
+		154E1AA3171564C100A0D168 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; };
+		154E1AA4171564C100A0D168 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; };
+		154E1AA5171564C200A0D168 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; };
+		154E1AA6171564C600A0D168 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A931715638900A0D168 /* libmediastreamer_base.a */; };
+		154E1AA7171564C600A0D168 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A931715638900A0D168 /* libmediastreamer_base.a */; };
+		154E1AA8171564C700A0D168 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A931715638900A0D168 /* libmediastreamer_base.a */; };
+		154E1AA9171564C900A0D168 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */; };
+		154E1AAA171564CA00A0D168 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */; };
+		154E1AAB171564CA00A0D168 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */; };
+		154E1AAC171564EA00A0D168 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; };
+		154E1AAD171564EA00A0D168 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; };
+		154E1AAE171564EB00A0D168 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; };
+		154E1AAF171564ED00A0D168 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; };
+		154E1AB0171564EE00A0D168 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; };
+		154E1AB1171564EE00A0D168 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; };
+		154E1AB21715661100A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; };
+		154E1AB31715661100A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; };
+		154E1AB41715661200A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; };
 		1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
 		1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
 		2220D5D81278461C008F2C2E /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5D71278461C008F2C2E /* CFNetwork.framework */; };
@@ -34,12 +63,6 @@
 		229499FA12A5433F00D6CF48 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5E912784672008F2C2E /* AudioToolbox.framework */; };
 		229499FB12A5433F00D6CF48 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B6A012A3E159001AE361 /* libresolv.dylib */; };
 		22D1B6A112A3E159001AE361 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B6A012A3E159001AE361 /* libresolv.dylib */; };
-		22E5AFC5133A2E260044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFC3133A2E260044EA25 /* libssl.a */; };
-		22E5AFC6133A2E260044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFC4133A2E260044EA25 /* libcrypto.a */; };
-		22E5AFC9133A2E3F0044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFC7133A2E3F0044EA25 /* libssl.a */; };
-		22E5AFCA133A2E3F0044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFC8133A2E3F0044EA25 /* libcrypto.a */; };
-		22E5AFCD133A2E5C0044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCB133A2E5C0044EA25 /* libssl.a */; };
-		22E5AFCE133A2E5C0044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCC133A2E5C0044EA25 /* libcrypto.a */; };
 		22E5AFD1133A2E760044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; };
 		22E5AFD2133A2E760044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; };
 		288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; };
@@ -48,7 +71,6 @@
 		34F9DFF614C41EBA00E1BC69 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */; };
 		34F9DFF714C41EBA00E1BC69 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; };
 		34F9DFF814C41EBA00E1BC69 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */; };
-		34F9DFF914C41EBA00E1BC69 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */; };
 		34F9DFFA14C41EBA00E1BC69 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF014C41EBA00E1BC69 /* libortp.a */; };
 		34F9DFFB14C41EBA00E1BC69 /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF114C41EBA00E1BC69 /* libosip2.a */; };
 		34F9DFFC14C41EBA00E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; };
@@ -67,7 +89,6 @@
 		34F9E00F14C4204600E1BC69 /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00514C41FCF00E1BC69 /* libvpx.a */; };
 		34F9E01014C4207700E1BC69 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */; };
 		34F9E01114C4208C00E1BC69 /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */; };
-		34F9E01214C4208C00E1BC69 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */; };
 		34F9E01314C4208C00E1BC69 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF014C41EBA00E1BC69 /* libortp.a */; };
 		34F9E01414C420A200E1BC69 /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF114C41EBA00E1BC69 /* libosip2.a */; };
 		34F9E01514C420A200E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; };
@@ -82,7 +103,6 @@
 		34F9E01E14C420DD00E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; };
 		34F9E01F14C420DD00E1BC69 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF314C41EBA00E1BC69 /* libspeex.a */; };
 		34F9E02014C420DD00E1BC69 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF414C41EBA00E1BC69 /* libspeexdsp.a */; };
-		34F9E02114C420F000E1BC69 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */; };
 		34F9E02214C420FA00E1BC69 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00A14C4202100E1BC69 /* QuartzCore.framework */; };
 		34F9E02314C4210100E1BC69 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00214C41FB400E1BC69 /* OpenGLES.framework */; };
 		34F9E02414C4211000E1BC69 /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00414C41FCF00E1BC69 /* libsrtp.a */; };
@@ -92,7 +112,6 @@
 		34F9E02814C4214500E1BC69 /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */; };
 		34F9E02914C4214500E1BC69 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */; };
 		34F9E02A14C4214500E1BC69 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */; };
-		34F9E02B14C4214500E1BC69 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */; };
 		34F9E02C14C4214500E1BC69 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF014C41EBA00E1BC69 /* libortp.a */; };
 		34F9E02D14C4214500E1BC69 /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF114C41EBA00E1BC69 /* libosip2.a */; };
 		34F9E02E14C4214500E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; };
@@ -115,6 +134,11 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		154E1A931715638900A0D168 /* libmediastreamer_base.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_base.a; path = "../../liblinphone-sdk/apple-darwin/lib/libmediastreamer_base.a"; sourceTree = "<group>"; };
+		154E1A951715639A00A0D168 /* libmediastreamer_voip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_voip.a; path = "../../liblinphone-sdk/apple-darwin/lib/libmediastreamer_voip.a"; sourceTree = "<group>"; };
+		154E1A971715642E00A0D168 /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = "../../liblinphone-sdk/apple-darwin/lib/libavutil.a"; sourceTree = "<group>"; };
+		154E1A991715644400A0D168 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = "../../liblinphone-sdk/apple-darwin/lib/libavcodec.a"; sourceTree = "<group>"; };
+		154E1A9B1715645F00A0D168 /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = "../../liblinphone-sdk/apple-darwin/lib/libswscale.a"; sourceTree = "<group>"; };
 		1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		1D6058910D05DD3D006BFB54 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
@@ -126,12 +150,6 @@
 		229499BA12A5417D00D6CF48 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		229499FF12A5433F00D6CF48 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		22D1B6A012A3E159001AE361 /* libresolv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libresolv.dylib; path = usr/lib/libresolv.dylib; sourceTree = SDKROOT; };
-		22E5AFC3133A2E260044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "../../liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = "<group>"; };
-		22E5AFC4133A2E260044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = "<group>"; };
-		22E5AFC7133A2E3F0044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "../../liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = "<group>"; };
-		22E5AFC8133A2E3F0044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = "<group>"; };
-		22E5AFCB133A2E5C0044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "../../liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = "<group>"; };
-		22E5AFCC133A2E5C0044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = "<group>"; };
 		22E5AFCF133A2E760044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "../../liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = "<group>"; };
 		22E5AFD0133A2E760044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = "<group>"; };
 		288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -144,7 +162,6 @@
 		34F9DFEC14C41EBA00E1BC69 /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "../../liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = "<group>"; };
 		34F9DFED14C41EBA00E1BC69 /* libilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbc.a; path = "../../liblinphone-sdk/apple-darwin/lib/libilbc.a"; sourceTree = "<group>"; };
 		34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "../../liblinphone-sdk/apple-darwin/lib/liblinphone.a"; sourceTree = "<group>"; };
-		34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer.a; path = "../../liblinphone-sdk/apple-darwin/lib/libmediastreamer.a"; sourceTree = "<group>"; };
 		34F9DFF014C41EBA00E1BC69 /* libortp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libortp.a; path = "../../liblinphone-sdk/apple-darwin/lib/libortp.a"; sourceTree = "<group>"; };
 		34F9DFF114C41EBA00E1BC69 /* libosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosip2.a; path = "../../liblinphone-sdk/apple-darwin/lib/libosip2.a"; sourceTree = "<group>"; };
 		34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosipparser2.a; path = "../../liblinphone-sdk/apple-darwin/lib/libosipparser2.a"; sourceTree = "<group>"; };
@@ -165,6 +182,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				154E1A9C1715645F00A0D168 /* libswscale.a in Frameworks */,
+				154E1A9A1715644400A0D168 /* libavcodec.a in Frameworks */,
+				154E1A981715642E00A0D168 /* libavutil.a in Frameworks */,
 				34F9E03714C424AF00E1BC69 /* CoreMedia.framework in Frameworks */,
 				34F9E03514C4249600E1BC69 /* CoreVideo.framework in Frameworks */,
 				34F9E03414C4247A00E1BC69 /* AVFoundation.framework in Frameworks */,
@@ -176,14 +196,13 @@
 				34F9DFF614C41EBA00E1BC69 /* libgsm.a in Frameworks */,
 				34F9DFF714C41EBA00E1BC69 /* libilbc.a in Frameworks */,
 				34F9DFF814C41EBA00E1BC69 /* liblinphone.a in Frameworks */,
-				34F9DFF914C41EBA00E1BC69 /* libmediastreamer.a in Frameworks */,
+				154E1A941715638900A0D168 /* libmediastreamer_base.a in Frameworks */,
+				154E1A961715639A00A0D168 /* libmediastreamer_voip.a in Frameworks */,
 				34F9DFFA14C41EBA00E1BC69 /* libortp.a in Frameworks */,
 				34F9DFFB14C41EBA00E1BC69 /* libosip2.a in Frameworks */,
 				34F9DFFC14C41EBA00E1BC69 /* libosipparser2.a in Frameworks */,
 				34F9DFFD14C41EBA00E1BC69 /* libspeex.a in Frameworks */,
 				34F9DFFE14C41EBA00E1BC69 /* libspeexdsp.a in Frameworks */,
-				22E5AFC5133A2E260044EA25 /* libssl.a in Frameworks */,
-				22E5AFC6133A2E260044EA25 /* libcrypto.a in Frameworks */,
 				1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
 				1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
 				288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */,
@@ -191,6 +210,8 @@
 				2220D5DA1278461C008F2C2E /* CoreAudio.framework in Frameworks */,
 				2220D5EA12784672008F2C2E /* AudioToolbox.framework in Frameworks */,
 				22D1B6A112A3E159001AE361 /* libresolv.dylib in Frameworks */,
+				154E1AAE171564EB00A0D168 /* libssl.a in Frameworks */,
+				154E1AAF171564ED00A0D168 /* libcrypto.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -207,15 +228,12 @@
 				34F9E01414C420A200E1BC69 /* libosip2.a in Frameworks */,
 				34F9E01514C420A200E1BC69 /* libosipparser2.a in Frameworks */,
 				34F9E01114C4208C00E1BC69 /* libeXosip2.a in Frameworks */,
-				34F9E01214C4208C00E1BC69 /* libmediastreamer.a in Frameworks */,
 				34F9E01314C4208C00E1BC69 /* libortp.a in Frameworks */,
 				34F9E01014C4207700E1BC69 /* liblinphone.a in Frameworks */,
 				34F9E00E14C4204600E1BC69 /* libsrtp.a in Frameworks */,
 				34F9E00F14C4204600E1BC69 /* libvpx.a in Frameworks */,
 				34F9E00C14C4203900E1BC69 /* OpenGLES.framework in Frameworks */,
 				34F9E00D14C4203900E1BC69 /* QuartzCore.framework in Frameworks */,
-				22E5AFC9133A2E3F0044EA25 /* libssl.a in Frameworks */,
-				22E5AFCA133A2E3F0044EA25 /* libcrypto.a in Frameworks */,
 				2294996912A53FEE00D6CF48 /* Foundation.framework in Frameworks */,
 				2294996A12A53FEE00D6CF48 /* UIKit.framework in Frameworks */,
 				2294996B12A53FEE00D6CF48 /* CoreGraphics.framework in Frameworks */,
@@ -223,6 +241,14 @@
 				2294997712A53FEE00D6CF48 /* CoreAudio.framework in Frameworks */,
 				2294997812A53FEE00D6CF48 /* AudioToolbox.framework in Frameworks */,
 				2294997912A53FEE00D6CF48 /* libresolv.dylib in Frameworks */,
+				154E1A9D171564B500A0D168 /* libavcodec.a in Frameworks */,
+				154E1AA0171564BA00A0D168 /* libavutil.a in Frameworks */,
+				154E1AA3171564C100A0D168 /* libilbc.a in Frameworks */,
+				154E1AA6171564C600A0D168 /* libmediastreamer_base.a in Frameworks */,
+				154E1AA9171564C900A0D168 /* libmediastreamer_voip.a in Frameworks */,
+				154E1AAD171564EA00A0D168 /* libssl.a in Frameworks */,
+				154E1AB0171564EE00A0D168 /* libcrypto.a in Frameworks */,
+				154E1AB21715661100A0D168 /* libswscale.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -237,7 +263,6 @@
 				34F9E02514C4211000E1BC69 /* libvpx.a in Frameworks */,
 				34F9E02314C4210100E1BC69 /* OpenGLES.framework in Frameworks */,
 				34F9E02214C420FA00E1BC69 /* QuartzCore.framework in Frameworks */,
-				34F9E02114C420F000E1BC69 /* libmediastreamer.a in Frameworks */,
 				34F9E01914C420DD00E1BC69 /* libeXosip2.a in Frameworks */,
 				34F9E01A14C420DD00E1BC69 /* libgsm.a in Frameworks */,
 				34F9E01B14C420DD00E1BC69 /* liblinphone.a in Frameworks */,
@@ -246,8 +271,6 @@
 				34F9E01E14C420DD00E1BC69 /* libosipparser2.a in Frameworks */,
 				34F9E01F14C420DD00E1BC69 /* libspeex.a in Frameworks */,
 				34F9E02014C420DD00E1BC69 /* libspeexdsp.a in Frameworks */,
-				22E5AFCD133A2E5C0044EA25 /* libssl.a in Frameworks */,
-				22E5AFCE133A2E5C0044EA25 /* libcrypto.a in Frameworks */,
 				229499A612A5417D00D6CF48 /* Foundation.framework in Frameworks */,
 				229499A712A5417D00D6CF48 /* UIKit.framework in Frameworks */,
 				229499A812A5417D00D6CF48 /* CoreGraphics.framework in Frameworks */,
@@ -255,6 +278,14 @@
 				229499B412A5417D00D6CF48 /* CoreAudio.framework in Frameworks */,
 				229499B512A5417D00D6CF48 /* AudioToolbox.framework in Frameworks */,
 				229499B612A5417D00D6CF48 /* libresolv.dylib in Frameworks */,
+				154E1A9E171564B500A0D168 /* libavcodec.a in Frameworks */,
+				154E1AA1171564BA00A0D168 /* libavutil.a in Frameworks */,
+				154E1AA4171564C100A0D168 /* libilbc.a in Frameworks */,
+				154E1AA7171564C600A0D168 /* libmediastreamer_base.a in Frameworks */,
+				154E1AAA171564CA00A0D168 /* libmediastreamer_voip.a in Frameworks */,
+				154E1AAC171564EA00A0D168 /* libssl.a in Frameworks */,
+				154E1AB1171564EE00A0D168 /* libcrypto.a in Frameworks */,
+				154E1AB31715661100A0D168 /* libswscale.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -268,7 +299,6 @@
 				34F9E02814C4214500E1BC69 /* libeXosip2.a in Frameworks */,
 				34F9E02914C4214500E1BC69 /* libgsm.a in Frameworks */,
 				34F9E02A14C4214500E1BC69 /* liblinphone.a in Frameworks */,
-				34F9E02B14C4214500E1BC69 /* libmediastreamer.a in Frameworks */,
 				34F9E02C14C4214500E1BC69 /* libortp.a in Frameworks */,
 				34F9E02D14C4214500E1BC69 /* libosip2.a in Frameworks */,
 				34F9E02E14C4214500E1BC69 /* libosipparser2.a in Frameworks */,
@@ -287,6 +317,12 @@
 				229499F912A5433F00D6CF48 /* CoreAudio.framework in Frameworks */,
 				229499FA12A5433F00D6CF48 /* AudioToolbox.framework in Frameworks */,
 				229499FB12A5433F00D6CF48 /* libresolv.dylib in Frameworks */,
+				154E1A9F171564B600A0D168 /* libavcodec.a in Frameworks */,
+				154E1AA2171564BA00A0D168 /* libavutil.a in Frameworks */,
+				154E1AA5171564C200A0D168 /* libilbc.a in Frameworks */,
+				154E1AA8171564C700A0D168 /* libmediastreamer_base.a in Frameworks */,
+				154E1AAB171564CA00A0D168 /* libmediastreamer_voip.a in Frameworks */,
+				154E1AB41715661200A0D168 /* libswscale.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -318,27 +354,25 @@
 				34F9E03314C4247A00E1BC69 /* AVFoundation.framework */,
 				34F9E00A14C4202100E1BC69 /* QuartzCore.framework */,
 				34F9E00814C41FE900E1BC69 /* CoreVideo.framework */,
-				34F9E00414C41FCF00E1BC69 /* libsrtp.a */,
-				34F9E00514C41FCF00E1BC69 /* libvpx.a */,
 				34F9E00214C41FB400E1BC69 /* OpenGLES.framework */,
+				154E1A991715644400A0D168 /* libavcodec.a */,
+				154E1A971715642E00A0D168 /* libavutil.a */,
+				22E5AFD0133A2E760044EA25 /* libcrypto.a */,
 				34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */,
 				34F9DFEC14C41EBA00E1BC69 /* libgsm.a */,
 				34F9DFED14C41EBA00E1BC69 /* libilbc.a */,
 				34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */,
-				34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */,
+				154E1A931715638900A0D168 /* libmediastreamer_base.a */,
+				154E1A951715639A00A0D168 /* libmediastreamer_voip.a */,
 				34F9DFF014C41EBA00E1BC69 /* libortp.a */,
 				34F9DFF114C41EBA00E1BC69 /* libosip2.a */,
 				34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */,
 				34F9DFF314C41EBA00E1BC69 /* libspeex.a */,
 				34F9DFF414C41EBA00E1BC69 /* libspeexdsp.a */,
+				34F9E00414C41FCF00E1BC69 /* libsrtp.a */,
 				22E5AFCF133A2E760044EA25 /* libssl.a */,
-				22E5AFD0133A2E760044EA25 /* libcrypto.a */,
-				22E5AFCB133A2E5C0044EA25 /* libssl.a */,
-				22E5AFCC133A2E5C0044EA25 /* libcrypto.a */,
-				22E5AFC7133A2E3F0044EA25 /* libssl.a */,
-				22E5AFC8133A2E3F0044EA25 /* libcrypto.a */,
-				22E5AFC3133A2E260044EA25 /* libssl.a */,
-				22E5AFC4133A2E260044EA25 /* libcrypto.a */,
+				154E1A9B1715645F00A0D168 /* libswscale.a */,
+				34F9E00514C41FCF00E1BC69 /* libvpx.a */,
 				080E96DDFE201D6D7F000001 /* Classes */,
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
 				29B97317FDCFA39411CA2CEA /* Resources */,

From 814545b13c24c2d401dd1b74dd4dba3422c714f7 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 10 Apr 2013 12:27:29 +0200
Subject: [PATCH 13/31] Install the tutorials source code in the sdk zip and
 use this installed source code in the tutorials xcode project.

---
 .../hello-world.xcodeproj/project.pbxproj     | 32 +++++++++----------
 submodules/build/builder-iphone-os.mk         |  1 +
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj b/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj
index 9e5c2c61c..0624e7e05 100755
--- a/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj
+++ b/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj
@@ -36,6 +36,10 @@
 		154E1AB21715661100A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; };
 		154E1AB31715661100A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; };
 		154E1AB41715661200A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; };
+		15FC168517157478003FDB31 /* buddy_status.c in Sources */ = {isa = PBXBuildFile; fileRef = 15FC167E17157478003FDB31 /* buddy_status.c */; };
+		15FC168817157478003FDB31 /* chatroom.c in Sources */ = {isa = PBXBuildFile; fileRef = 15FC167F17157478003FDB31 /* chatroom.c */; };
+		15FC168A17157478003FDB31 /* helloworld.c in Sources */ = {isa = PBXBuildFile; fileRef = 15FC168017157478003FDB31 /* helloworld.c */; };
+		15FC168F17157478003FDB31 /* registration.c in Sources */ = {isa = PBXBuildFile; fileRef = 15FC168117157478003FDB31 /* registration.c */; };
 		1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
 		1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
 		2220D5D81278461C008F2C2E /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5D71278461C008F2C2E /* CFNetwork.framework */; };
@@ -66,7 +70,6 @@
 		22E5AFD1133A2E760044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; };
 		22E5AFD2133A2E760044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; };
 		288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; };
-		34F9DFE914C418B600E1BC69 /* helloworld.c in Sources */ = {isa = PBXBuildFile; fileRef = 34F9DFE514C418B600E1BC69 /* helloworld.c */; };
 		34F9DFF514C41EBA00E1BC69 /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */; };
 		34F9DFF614C41EBA00E1BC69 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */; };
 		34F9DFF714C41EBA00E1BC69 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; };
@@ -76,9 +79,6 @@
 		34F9DFFC14C41EBA00E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; };
 		34F9DFFD14C41EBA00E1BC69 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF314C41EBA00E1BC69 /* libspeex.a */; };
 		34F9DFFE14C41EBA00E1BC69 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF414C41EBA00E1BC69 /* libspeexdsp.a */; };
-		34F9DFFF14C41F4900E1BC69 /* buddy_status.c in Sources */ = {isa = PBXBuildFile; fileRef = 34F9DFE314C418B600E1BC69 /* buddy_status.c */; };
-		34F9E00014C41F4E00E1BC69 /* chatroom.c in Sources */ = {isa = PBXBuildFile; fileRef = 34F9DFE414C418B600E1BC69 /* chatroom.c */; };
-		34F9E00114C41F5300E1BC69 /* registration.c in Sources */ = {isa = PBXBuildFile; fileRef = 34F9DFE614C418B600E1BC69 /* registration.c */; };
 		34F9E00314C41FB400E1BC69 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00214C41FB400E1BC69 /* OpenGLES.framework */; };
 		34F9E00614C41FCF00E1BC69 /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00414C41FCF00E1BC69 /* libsrtp.a */; };
 		34F9E00714C41FCF00E1BC69 /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00514C41FCF00E1BC69 /* libvpx.a */; };
@@ -139,6 +139,10 @@
 		154E1A971715642E00A0D168 /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = "../../liblinphone-sdk/apple-darwin/lib/libavutil.a"; sourceTree = "<group>"; };
 		154E1A991715644400A0D168 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = "../../liblinphone-sdk/apple-darwin/lib/libavcodec.a"; sourceTree = "<group>"; };
 		154E1A9B1715645F00A0D168 /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = "../../liblinphone-sdk/apple-darwin/lib/libswscale.a"; sourceTree = "<group>"; };
+		15FC167E17157478003FDB31 /* buddy_status.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = buddy_status.c; path = "../../liblinphone-sdk/apple-darwin/share/linphone/tutorials/buddy_status.c"; sourceTree = "<group>"; };
+		15FC167F17157478003FDB31 /* chatroom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = chatroom.c; path = "../../liblinphone-sdk/apple-darwin/share/linphone/tutorials/chatroom.c"; sourceTree = "<group>"; };
+		15FC168017157478003FDB31 /* helloworld.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = helloworld.c; path = "../../liblinphone-sdk/apple-darwin/share/linphone/tutorials/helloworld.c"; sourceTree = "<group>"; };
+		15FC168117157478003FDB31 /* registration.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = registration.c; path = "../../liblinphone-sdk/apple-darwin/share/linphone/tutorials/registration.c"; sourceTree = "<group>"; };
 		1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		1D6058910D05DD3D006BFB54 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
@@ -154,10 +158,6 @@
 		22E5AFD0133A2E760044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = "<group>"; };
 		288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		32CA4F630368D1EE00C91783 /* hello_world_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hello_world_Prefix.pch; sourceTree = "<group>"; };
-		34F9DFE314C418B600E1BC69 /* buddy_status.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = buddy_status.c; path = ../../submodules/linphone/coreapi/help/buddy_status.c; sourceTree = "<group>"; };
-		34F9DFE414C418B600E1BC69 /* chatroom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = chatroom.c; path = ../../submodules/linphone/coreapi/help/chatroom.c; sourceTree = "<group>"; };
-		34F9DFE514C418B600E1BC69 /* helloworld.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = helloworld.c; path = ../../submodules/linphone/coreapi/help/helloworld.c; sourceTree = "<group>"; };
-		34F9DFE614C418B600E1BC69 /* registration.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = registration.c; path = ../../submodules/linphone/coreapi/help/registration.c; sourceTree = "<group>"; };
 		34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeXosip2.a; path = "../../liblinphone-sdk/apple-darwin/lib/libeXosip2.a"; sourceTree = "<group>"; };
 		34F9DFEC14C41EBA00E1BC69 /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "../../liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = "<group>"; };
 		34F9DFED14C41EBA00E1BC69 /* libilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbc.a; path = "../../liblinphone-sdk/apple-darwin/lib/libilbc.a"; sourceTree = "<group>"; };
@@ -390,10 +390,10 @@
 		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
 			isa = PBXGroup;
 			children = (
-				34F9DFE314C418B600E1BC69 /* buddy_status.c */,
-				34F9DFE414C418B600E1BC69 /* chatroom.c */,
-				34F9DFE514C418B600E1BC69 /* helloworld.c */,
-				34F9DFE614C418B600E1BC69 /* registration.c */,
+				15FC167E17157478003FDB31 /* buddy_status.c */,
+				15FC167F17157478003FDB31 /* chatroom.c */,
+				15FC168017157478003FDB31 /* helloworld.c */,
+				15FC168117157478003FDB31 /* registration.c */,
 				32CA4F630368D1EE00C91783 /* hello_world_Prefix.pch */,
 			);
 			name = "Other Sources";
@@ -551,7 +551,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				34F9DFE914C418B600E1BC69 /* helloworld.c in Sources */,
+				15FC168A17157478003FDB31 /* helloworld.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -559,7 +559,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				34F9E00114C41F5300E1BC69 /* registration.c in Sources */,
+				15FC168F17157478003FDB31 /* registration.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -567,7 +567,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				34F9E00014C41F4E00E1BC69 /* chatroom.c in Sources */,
+				15FC168817157478003FDB31 /* chatroom.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -575,7 +575,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				34F9DFFF14C41F4900E1BC69 /* buddy_status.c in Sources */,
+				15FC168517157478003FDB31 /* buddy_status.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk
index d481f90a5..e7643586d 100644
--- a/submodules/build/builder-iphone-os.mk
+++ b/submodules/build/builder-iphone-os.mk
@@ -111,6 +111,7 @@ veryclean: veryclean-linphone veryclean-msbcg729
 
 .NOTPARALLEL build-linphone: init build-openssl build-srtp build-zrtpcpp build-osip2 build-eXosip2  build-speex build-libgsm build-ffmpeg build-libvpx detect_gpl_mode_switch $(LINPHONE_BUILD_DIR)/Makefile
 	cd $(LINPHONE_BUILD_DIR)  && export PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install
+	mkdir -p $(prefix)/share/linphone/tutorials && cp -f $(LINPHONE_SRC_DIR)/coreapi/help/*.c $(prefix)/share/linphone/tutorials/
 
 clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm  clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 
 	cd  $(LINPHONE_BUILD_DIR) && make clean

From 8e8f49949f07ba71f7d42319de223f82ceb0cadd Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 11 Apr 2013 14:36:12 +0200
Subject: [PATCH 14/31] Set the time of received chat messages from the content
 of this message instead of the current time.

---
 Classes/LinphoneManager.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 5ee4f8e62..f695d3329 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -578,7 +578,7 @@ static void linphone_iphone_registration_state(LinphoneCore *lc, LinphoneProxyCo
 		[chat setMessage:[NSString stringWithUTF8String:linphone_chat_message_get_text(msg)]];
     }
 	[chat setDirection:[NSNumber numberWithInt:1]];
-    [chat setTime:[NSDate date]];
+    [chat setTime:[NSDate dateWithTimeIntervalSince1970:linphone_chat_message_get_time(msg)]];
     [chat setRead:[NSNumber numberWithInt:0]];
     [chat create];
     

From 3d4296dce23edf2adb6d4d494bc7c0db40cc5bf2 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 12 Apr 2013 10:57:28 +0200
Subject: [PATCH 15/31] Update linphone submodule for fix of chat messages
 time.

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index d630e0a99..5ddf9069f 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit d630e0a99decbed3e9a5437b680801dd236beb40
+Subproject commit 5ddf9069f0c5f487b65ef5b64dbd19a56066b350

From e5e3b4c02ee95d5dcd8a195bd985f63135243d4f Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 17 Apr 2013 15:52:50 +0200
Subject: [PATCH 16/31] update liblinphone for publish fix.

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 5ddf9069f..bf492b427 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 5ddf9069f0c5f487b65ef5b64dbd19a56066b350
+Subproject commit bf492b4278d1c68b2da55c65da173a33aec32ea1

From ad1841751211bee730d2866e597c72a0ccd7fed6 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 19 Apr 2013 16:53:37 +0200
Subject: [PATCH 17/31] update linphone submodule

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index bf492b427..8b35826dd 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit bf492b4278d1c68b2da55c65da173a33aec32ea1
+Subproject commit 8b35826ddd1bdbdd88c61c3b76e6f4b1d3b43a39

From 5206fb1fb191a1defbab23dd58e9d6288698ae48 Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Sun, 21 Apr 2013 22:11:13 +0200
Subject: [PATCH 18/31] Add aac-eld in the list of available codecs - two
 configurations (narrow band and wide band)

---
 Classes/LinphoneManager.m                 |  2 ++
 Settings/InAppSettings.bundle/Audio.plist | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index f695d3329..92976227d 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -131,6 +131,8 @@ struct codec_name_pref_table codec_pref_table[]={
 	{ "mp4v-es", 90000, @"mp4v-es_preference"},
 	{ "h264", 90000, @"h264_preference"},
 	{ "vp8", 90000, @"vp8_preference"},
+	{ "mpeg4-generic", 44100, @"aaceld_44k_preference"},
+	{ "mpeg4-generic", 22050, @"aaceld_22k_preference"},
 	{ NULL,0,Nil }
 };
 
diff --git a/Settings/InAppSettings.bundle/Audio.plist b/Settings/InAppSettings.bundle/Audio.plist
index 422f9fc29..4331a88d4 100644
--- a/Settings/InAppSettings.bundle/Audio.plist
+++ b/Settings/InAppSettings.bundle/Audio.plist
@@ -120,6 +120,26 @@
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<false/>
+			<key>Key</key>
+			<string>aaceld_44k_preference</string>
+			<key>Title</key>
+			<string>AAC-ELD 44kHz</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<true/>
+			<key>Key</key>
+			<string>aaceld_22k_preference</string>
+			<key>Title</key>
+			<string>AAC-ELD 22kHz</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
 		<dict>
 			<key>Key</key>
 			<string>audio_advanced_group</string>

From 10a1c722f087ba72b4b609864d00d4960cbfed8b Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Sun, 21 Apr 2013 22:14:34 +0200
Subject: [PATCH 19/31] Add aac-eld.c to the xcode project

---
 submodules/liblinphone.xcodeproj/project.pbxproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj
index a85ff2e50..dc4fcbf65 100644
--- a/submodules/liblinphone.xcodeproj/project.pbxproj
+++ b/submodules/liblinphone.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		0406A7661721FF79009FD24F /* aac-eld.c in Sources */ = {isa = PBXBuildFile; fileRef = 0406A7651721FF79009FD24F /* aac-eld.c */; };
 		220ED19A13A8F87700AC21E0 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19713A8F87700AC21E0 /* libspeexdsp.a */; };
 		220ED19B13A8F87700AC21E0 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19813A8F87700AC21E0 /* libspeex.a */; };
 		220ED19C13A8F87700AC21E0 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19913A8F87700AC21E0 /* libortp.a */; };
@@ -421,6 +422,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		0406A7651721FF79009FD24F /* aac-eld.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "aac-eld.c"; sourceTree = "<group>"; };
 		2203127413A249F70049A2ED /* filter-template.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "filter-template.c"; sourceTree = "<group>"; };
 		220ED19713A8F87700AC21E0 /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = "<group>"; };
 		220ED19813A8F87700AC21E0 /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeex.a"; sourceTree = "<group>"; };
@@ -1048,6 +1050,7 @@
 		223CA7EF16D9268D00EF1BEC /* audiofilters */ = {
 			isa = PBXGroup;
 			children = (
+				0406A7651721FF79009FD24F /* aac-eld.c */,
 				22D07CE416F3BFCB009F2C9E /* speexec.c */,
 				223CA7F016D9268D00EF1BEC /* alaw.c */,
 				223CA7F216D9268D00EF1BEC /* aqsnd.c */,
@@ -1747,6 +1750,7 @@
 				221DCB57152A07050025E54D /* ec-calibrator.c in Sources */,
 				221DCB6C153584410025E54D /* yuv2rgb.fs in Sources */,
 				221DCB6E153584410025E54D /* yuv2rgb.vs in Sources */,
+				0406A7661721FF79009FD24F /* aac-eld.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

From 1edbbc56a112ca2771d373418cdc6666be91f995 Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Mon, 22 Apr 2013 11:13:45 +0200
Subject: [PATCH 20/31] Add linphone with aac-eld support

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 8b35826dd..87a6e07ad 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 8b35826ddd1bdbdd88c61c3b76e6f4b1d3b43a39
+Subproject commit 87a6e07ad9eb8ceddd7d451f438d140e92f82e3d

From 336d090a90b23e4f8dc74c10c7f6b64e5ff68591 Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Mon, 22 Apr 2013 11:29:15 +0200
Subject: [PATCH 21/31] Typo in oRTP aac-eld payload type name

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 87a6e07ad..12540ce01 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 87a6e07ad9eb8ceddd7d451f438d140e92f82e3d
+Subproject commit 12540ce01c9f024266f6f465c972f72a0c2594bb

From ed0ad82970bf22a67fd191afcd836640f480c85a Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Mon, 22 Apr 2013 10:48:36 +0200
Subject: [PATCH 22/31] fix rotation issue introduced by fixe of mode
 display_filter_auto_rotate

---
 Classes/InCallViewController.m    | 19 +------------------
 Resources/linphonerc              |  1 -
 Resources/linphonerc-factory      |  2 ++
 Resources/linphonerc-factory~ipad |  3 +++
 Resources/linphonerc~ipad         |  4 ++--
 5 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/Classes/InCallViewController.m b/Classes/InCallViewController.m
index fe54143e8..e23e914ed 100644
--- a/Classes/InCallViewController.m
+++ b/Classes/InCallViewController.m
@@ -202,24 +202,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
     [super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
-    CGRect frame = [videoPreview frame];
-    switch (toInterfaceOrientation) {
-        case UIInterfaceOrientationPortrait:
-            [videoPreview setTransform: CGAffineTransformMakeRotation(0)];
-            break;
-        case UIInterfaceOrientationPortraitUpsideDown:
-            [videoPreview setTransform: CGAffineTransformMakeRotation(M_PI)];
-            break;
-        case UIInterfaceOrientationLandscapeLeft:
-            [videoPreview setTransform: CGAffineTransformMakeRotation(M_PI / 2)];
-            break;
-        case UIInterfaceOrientationLandscapeRight:
-            [videoPreview setTransform: CGAffineTransformMakeRotation(-M_PI / 2)];
-            break;
-        default:
-            break;
-    }
-    [videoPreview setFrame:frame];
+// in mode display_filter_auto_rotate=0, no need to rotate the preview
 }
 
 
diff --git a/Resources/linphonerc b/Resources/linphonerc
index 040abc310..560a9780a 100644
--- a/Resources/linphonerc
+++ b/Resources/linphonerc
@@ -14,7 +14,6 @@ capture=1
 show_local=0
 enabled=1
 size=qvga
-display_filter_auto_rotate=1
 automatically_initiate=0
 automatically_accept=0
 
diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory
index e16499cd6..fb48ebbdf 100644
--- a/Resources/linphonerc-factory
+++ b/Resources/linphonerc-factory
@@ -45,3 +45,5 @@ sharing_server=https://www.linphone.org:444/upload.php
 ice=1
 stun=stun.linphone.org
 
+[video]
+display_filter_auto_rotate=0
diff --git a/Resources/linphonerc-factory~ipad b/Resources/linphonerc-factory~ipad
index e9e636be0..80aa4e891 100644
--- a/Resources/linphonerc-factory~ipad
+++ b/Resources/linphonerc-factory~ipad
@@ -44,3 +44,6 @@ transport=tls
 sharing_server=https://www.linphone.org:444/upload.php
 ice=1
 stun=stun.linphone.org
+
+[video]
+display_filter_auto_rotate=0
diff --git a/Resources/linphonerc~ipad b/Resources/linphonerc~ipad
index 9458f6e74..4efe5a33e 100644
--- a/Resources/linphonerc~ipad
+++ b/Resources/linphonerc~ipad
@@ -14,7 +14,6 @@ capture=1
 show_local=1
 enabled=1
 size=vga
-display_filter_auto_rotate=1
 automatically_initiate=0
 automatically_accept=0
 
@@ -27,4 +26,5 @@ animations_preference=1
 edge_opt_preference=0
 
 [default_values]
-reg_expires=600
\ No newline at end of file
+reg_expires=600
+

From acbc41d7dc4ef5a00bcadf2fb8cbe9415df1b398 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 23 Apr 2013 12:12:01 +0200
Subject: [PATCH 23/31] update liblinphone for beep bug.

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 12540ce01..6fcf76e40 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 12540ce01c9f024266f6f465c972f72a0c2594bb
+Subproject commit 6fcf76e405a695f86a446f430903682f42155f43

From 731821bd24df26eba01f509c1d78e0d5d897268c Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 25 Apr 2013 10:43:17 +0200
Subject: [PATCH 24/31]  add special case to compute aac network birate

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 6fcf76e40..bf3e43611 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 6fcf76e405a695f86a446f430903682f42155f43
+Subproject commit bf3e43611778efc483999cacc470aed67fc6b83d

From ec30ae5a67860c9b73877f827042a226e04a8a03 Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Thu, 25 Apr 2013 17:03:21 +0200
Subject: [PATCH 25/31] Aac-eld add missing headers according to RFC3640 3.3.6

---
 submodules/Default-568h@2x.png | Bin 0 -> 18594 bytes
 submodules/linphone            |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 submodules/Default-568h@2x.png

diff --git a/submodules/Default-568h@2x.png b/submodules/Default-568h@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0891b7aabfcf3422423b109c8beed2bab838c607
GIT binary patch
literal 18594
zcmeI4X;f257Jx&9fS`ixvS<t-ibFzz5_k!T3JQoUvIwYv0Rl$ILI@DSAdV|I-3*P(
zfC{JGP&h0$$|7NLX<<NCwPlgbR?rbTXh74l%}ZEB?3ww~f99Ox2j{(8_tvetx9Xnv
z)j5?UcUOm{%6iHO1Y)U^qrC?LflNdo<T*+xSQ3}=8vZYD%&@a_ce1lXyK~v0j0idc
zVZHpgcMrSMOOuks_PDA|Mf*COO#ZpR+jCEuzFyuVlvCQZq3zn&-nN+;zk-NKH}w@e
z-xlY%#UCM}#^pA(FH&_RuU?7@if{i|ecQ?Nq*;!WWBi+ks;k!wDR}pl#{`*rKHNL{
zx!$J7W`Hyh&}nZQ$hecS!u!;@-26*T#%I&Awa;X_B)1klbzbx|_pPgWYJGz`_MX<K
z#&>;&$x8J@slQFSel)6zJN=?13FB7H(lQjRkSy8x_-S~tvu2gzn1oS+dLcF#eqtq$
z%tf9TTvX?`)R@}3uBI;jzS-=ZR-Td&MHaS&;!0?Ni*#$#`n*~CcQK)<MR`BaxJ`Yy
zl*khNlq&W@^vIz9QQxtP*UExRRg=2cfAp$MqCUSfVleDn7+6r|L_4e?N%`D*2+3cy
zbL8d^0$%rkLttQ@W;d!^A-;u^t>Q9vAQ~TUpnI!j)a2biYK^R)M~A5wUDZhx?ULMX
z3x1P&qt=trOY6P2U67L=m=U?F|5#Uj(eCueNTZaHs_ceWiHeET+j+tp3Jt9g(ekqP
z2WOvfR{qV+9r+o4J5?qK>7;;^+I7tGv-i)es$X_D=EoKF+S?zsyj^oRFElP}c}JT<
zd8SUs-?O?}2YD#ngKbnHgzHBcboxK_2r9l(?eNCl-pEzkJm}fY?WC*jnS?VBE4EpY
zO$fEejz6fU;W2Kl>JeQBZBl-%Irg`obSlg*@4QB;Dd1H7^Oi5wvt4d{RZ!8Og?^aE
z)k0$1g+V3fd(gdQ3d&q2q-FL*uy#}|bc^=VhFsl0jBgUGJ+-s3U8MK9A!YJJMxpci
z5hJ%|{DwV48fZn0{n5l$N_KcSb#NKE4plB`9I6Zt=Z!~-zw0{9tg$L&Ju1F0X)Cy8
zKF;(&lJ><VpZl?HIOhIhzLBBrUb!bGOW(13{hB*GI&NLL_OIWMG#jnCN3EqiZY}F;
z&Y8SCd6RV`@P^LQ9@2qhD@fOk1!jWv6Ke&g0^G!oWS-w$%!IN3*~(O`f=#)oBFm&L
zz95jM(Ut7K|5<p}MpIAMy7*T*ug{DN$A2R07iyLTu1w2*RWUrc_+!J83Bw9qo^sIv
zmpk$1@8xwjsG6WIp`JhT`uSKcPus6EEA6_6Rqdm;5u@ywy%%4fOXfqF$)=7;qSI~<
zYhGF+OEQI$0Lhxd>x)Jw(=;p~sF(Sd9VWGwFE2rnyS9!f^DZ<u_$Q!xmR)wrjrql@
zPRpmgAg5s6;zM<%1pj9aC$$<jXf?fFYZY5sasTuc<I1C$@84|h9;@6M)3t>8+aCLq
zQ};>lcJ1GDLqjm6Hd>|Eabno@P`~Bn(~6^aD_#y<aeReJ^@Iw0#th#&zwF|bwD1!@
zc{iEblU5P+rt*n;q(ID+b_-oh^+QDRBlOp6zy)J5$I&keflz^;RW#%f85ecoBGSk3
z^5yxu?0|yVOe`&g9Yn|SnH*RffgtlC_>oEH(a?Nm1S<;S+hSxI5d16^<1lEM3NPFi
z<Lly%wqtYY=#5xBmVlusqtR$GHzXADu-`Ug4!_xA_Vaig2#1S}jm5@VV%gj<9Nxyp
z24_LQ5eVk6hI!OM7LUd^XGIxJcQV_LJv}Oz%i!=BY!+JDFD-~2&9lW|q>kqPrpL)+
zgnseFikg`gJVBha1&7C4;O6><P03Oz<Ux;OM?_1z_hvD86g*j`yiokb+q9J(o5|tQ
zqoQCl%ElR!`Lc!jzF*u>h=dt~`ND+;Zd?W(4v2JIb7Pt>Td42%M-Ju-XAH<VX%OcH
zRhBVnG#1GJSFq`P#(xO5wB_4iOQn!IgHMm}wP!HtELrHRHdv5xf7mi_ezJBub_AR2
z$)N?)rQuj8TBt4a<M+i69&c$i-_g9LKRYfV!E=k96U~i~E%lIK96f>#Pns762L}K3
zDhvsRqN0Ni(1UrishD2YvV?4*h2iFj$+&N||Fn$4n|^NSU+o?~jq`0jVQt8T9l{7b
zXiwwODFh2V!Q6sqP9S>WH$oOf$N~=d0-bqTlD61!=`<dj>&0eAP-F>XN?*|gtOXX{
zQVTWyYo4ZK0GAw!GHf|pz9`D;-bbb*5LBX*{bnz|+)$@&P9|ORM2o?95{;ejvo&r-
zq8cBhTN6nn)7~W>54U)%-F_-b?YKdfk5I8MHcuzBD5)!;yv#Z&R&^y=@=>VTIMy#r
zX&U<=BsPkdqc<fY<dE`8<5LO&Sy~B@=##jTB>Me<_}2+>H%XKyrr5ZR8_KVe>ZqYN
z^=^~TFD};;rHJ$U;{~w^hYojl4hRI@SH$^K{YEo=sg)WY87r!*7blQK&qnpDo0`Vn
zkl)9u9g=mCh&ZCJS(<P!_D;9YfNeQ)IJv5+QGB85Xz#53iyPI?;(Wvt`hw@wC7OrN
zpGc7nQ4P%*Lw@p+_#ZYMoK;mjr6i#y7@aI$Gc&+_NF+yn_63bWBS4!h>L4yN3k0kQ
zuvg$h2KEEk51T+O0JQ+r0`R>g{jvqM0Mr6d3qUOZwE!?PI7<M01kRAaHxW2H1ZRif
zJbC)$AMg?2Bfv+1j{qM5J_39M_z3V3;3L3CfR6wl0X_n32-py?Az(wmhJXzL8v-^2
zYzWv8upwYWz=nVg0UH7~1Z)V{5U?R&L%@cB4FMbeAG4tkqFbaoo595D29+0qa*`2Y
z6)VA8MSb=v`QC<4Bg)lb0~2wXJ@PB(T^(1*|D`-b)DGV*ADEgP?n_T;EGIQNOy56;
zFL#rWKI0W+(ffl1-DGN|wdlN<Vk_zrciViW)6`_<);QKDta%<NS7j|~5>HY@CE|dr
sfw?Q;rAv?G4&^^8-z_>&sWXMxvD*gPOU4CBe-*@OtE+wfmVJNyHv)PfH~;_u

literal 0
HcmV?d00001

diff --git a/submodules/linphone b/submodules/linphone
index bf3e43611..5f109bfb5 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit bf3e43611778efc483999cacc470aed67fc6b83d
+Subproject commit 5f109bfb55224b69dd598d95c2c0dd47fa87b960

From 6d3ae54e75e8be2ab07e559067fb0e759639fb40 Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Fri, 26 Apr 2013 01:13:55 +0200
Subject: [PATCH 26/31] aac-eld support multiframe per packet decoding

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 5f109bfb5..a0a70a59d 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 5f109bfb55224b69dd598d95c2c0dd47fa87b960
+Subproject commit a0a70a59dfedfe22ed3fae3df88a6363bd8596e0

From 4c944f5538f35d0f1f817d9d0bab7096ab15cc8b Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 3 May 2013 14:39:04 +0200
Subject: [PATCH 27/31] update linphone submodule for Refer bugfix

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index a0a70a59d..4da039cd5 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit a0a70a59dfedfe22ed3fae3df88a6363bd8596e0
+Subproject commit 4da039cd52a3258f6ce0c09a9a53da1026beadfb

From 979a0b0469872f4485cee259aed4866ffbbc6e5d Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 6 May 2013 22:11:11 +0200
Subject: [PATCH 28/31] update linphone submodule for conferencing bugfixes.

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 4da039cd5..ca42ee87d 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 4da039cd52a3258f6ce0c09a9a53da1026beadfb
+Subproject commit ca42ee87ded3fa4cbf44757f13e2f5537afbb498

From 3ce69628166929cd3835254532d8831050de83d1 Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Thu, 9 May 2013 22:49:25 +0200
Subject: [PATCH 29/31] AAC-ELD: fix SDP/ftmp content according to new
 recommendation from Fraunhofer

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index ca42ee87d..12a3d7951 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit ca42ee87ded3fa4cbf44757f13e2f5537afbb498
+Subproject commit 12a3d795131ab1b367ae000f8b70f9b8af684df6

From 5ea8097dddec301784cb1259b22d174bb51ae732 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 22 May 2013 16:13:35 +0200
Subject: [PATCH 30/31] update libvpx to v1.2.0

---
 Classes/ContactDetailsTableViewController.m   |  2 +-
 .../LinphoneUI/UICompositeViewController.m    | 12 ++--
 linphone.xcodeproj/project.pbxproj            | 32 ++++++++--
 submodules/build/builders.d/libvpx.mk         |  7 ++-
 submodules/build/builders.d/libvpx.patch      | 59 ++-----------------
 submodules/build/iphone-config.site           |  8 +--
 submodules/externals/libvpx                   |  2 +-
 7 files changed, 51 insertions(+), 71 deletions(-)

diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m
index 8f49fd838..7fe664112 100644
--- a/Classes/ContactDetailsTableViewController.m
+++ b/Classes/ContactDetailsTableViewController.m
@@ -537,7 +537,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C
     NSMutableArray *sectionDict = [self getSectionData:[indexPath section]];
     Entry *entry  = [sectionDict objectAtIndex:[indexPath row]];
     if (![self isEditing]) {
-        NSString *dest;
+        NSString *dest=NULL;;
         if(contactSections[[indexPath section]] == ContactSections_Number) {
             ABMultiValueRef lMap = ABRecordCopyValue(contact, kABPersonPhoneProperty);
             int index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]);
diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m
index aa7237646..7a1913db0 100644
--- a/Classes/LinphoneUI/UICompositeViewController.m
+++ b/Classes/LinphoneUI/UICompositeViewController.m
@@ -103,7 +103,7 @@
 
 - (void)initUICompositeViewController {
     viewControllerCache = [[NSMutableDictionary alloc] init];
-    currentOrientation = UIDeviceOrientationUnknown;
+    currentOrientation = (UIInterfaceOrientation)UIDeviceOrientationUnknown;
 }
 
 - (id)init{
@@ -416,18 +416,18 @@
                 if(currentOrientation == UIDeviceOrientationUnknown) {
                     return [UIApplication sharedApplication].statusBarOrientation;
                 }
-                deviceOrientation = currentOrientation;
+                deviceOrientation = (UIDeviceOrientation)currentOrientation;
             }
             if (UIDeviceOrientationIsPortrait(deviceOrientation)) {
                 if ([currentViewDescription portraitMode]) {
-                    return deviceOrientation;
+                    return (UIInterfaceOrientation)deviceOrientation;
                 } else {
                     return UIInterfaceOrientationLandscapeLeft;
                 }
             }
             if (UIDeviceOrientationIsLandscape(deviceOrientation)) {
                 if ([currentViewDescription landscapeMode]) {
-                    return deviceOrientation;
+                    return (UIInterfaceOrientation)deviceOrientation;
                 } else {
                     return UIInterfaceOrientationPortrait;
                 }
@@ -435,7 +435,7 @@
         } else if([rotationPreference isEqualToString:@"portrait"]) {
             if ([currentViewDescription portraitMode]) {
                 if (UIDeviceOrientationIsPortrait(deviceOrientation)) {
-                    return deviceOrientation;
+                    return (UIInterfaceOrientation)deviceOrientation;
                 } else {
                     if(UIInterfaceOrientationIsPortrait([UIApplication sharedApplication].statusBarOrientation)) {
                         return [UIApplication sharedApplication].statusBarOrientation;
@@ -449,7 +449,7 @@
         } else if([rotationPreference isEqualToString:@"landscape"]) {
             if ([currentViewDescription landscapeMode]) {
                 if (UIDeviceOrientationIsLandscape(deviceOrientation)) {
-                    return deviceOrientation;
+                    return (UIInterfaceOrientation)deviceOrientation;
                 } else {
                     if(UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation)) {
                         return [UIApplication sharedApplication].statusBarOrientation;
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 28efeaf74..8f5029539 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -75,6 +75,8 @@
 		1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
 		1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
 		1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+		2200C2DB174BB87A002E9A70 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22405EED1600B4E400B92522 /* AssetsLibrary.framework */; };
+		2200C2DC174BBB24002E9A70 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 226EF06B15FA256B005865C7 /* MobileCoreServices.framework */; };
 		22058C71116E305000B08DDD /* linphone_icon_57.png in Resources */ = {isa = PBXBuildFile; fileRef = 22058C70116E305000B08DDD /* linphone_icon_57.png */; };
 		220FAD3110765B400068D98F /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2810765B400068D98F /* libeXosip2.a */; };
 		220FAD3210765B400068D98F /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2910765B400068D98F /* libgsm.a */; };
@@ -2481,6 +2483,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				2200C2DC174BBB24002E9A70 /* MobileCoreServices.framework in Frameworks */,
+				2200C2DB174BB87A002E9A70 /* AssetsLibrary.framework in Frameworks */,
 				D30562131671DC3E00C97967 /* libNinePatch.a in Frameworks */,
 				D30562141671DC3E00C97967 /* libXMLRPC.a in Frameworks */,
 				22D8F170147548E2008C97DB /* AVFoundation.framework in Frameworks */,
@@ -3800,7 +3804,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0450;
+				LastUpgradeCheck = 0460;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "linphone" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -5494,15 +5498,20 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier";
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				LIBRARY_SEARCH_PATHS = "";
-				PROVISIONING_PROFILE = "7763350E-083E-4ADA-8535-05883F19F947";
+				PROVISIONING_PROFILE = "BB7E624F-8CD6-448B-A235-CE8DBB401F92";
 				SDKROOT = iphoneos;
 				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -5732,10 +5741,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
@@ -5798,10 +5812,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier";
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
@@ -5865,15 +5884,20 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)";
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				LIBRARY_SEARCH_PATHS = "";
-				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE = "2AC0DC11-4546-47B6-8B8A-453CCA80903C";
 				SDKROOT = iphoneos;
 				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
 				TARGETED_DEVICE_FAMILY = "1,2";
diff --git a/submodules/build/builders.d/libvpx.mk b/submodules/build/builders.d/libvpx.mk
index 8cf0564ec..badceee91 100644
--- a/submodules/build/builders.d/libvpx.mk
+++ b/submodules/build/builders.d/libvpx.mk
@@ -14,6 +14,9 @@ else
 	libvpx_configure_options+= --target=x86-darwin10-gcc
 endif
 libvpx_dir?=externals/libvpx
+all_p=armv6-darwin-gcc    #neon Cortex-A8
+all_p+=armv7-darwin-gcc    #neon Cortex-A8
+all_p+=armv7s-darwin-gcc   #neon Cortex-A8
 
 $(BUILDER_SRC_DIR)/$(libvpx_dir)/patched.stamp:
 	cd $(BUILDER_SRC_DIR)/$(libvpx_dir) \
@@ -24,10 +27,10 @@ $(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk: $(BUILDER_SRC_DIR)/$(libvpx_dir)/p
 	mkdir -p $(BUILDER_BUILD_DIR)/$(libvpx_dir)
 	cd $(BUILDER_BUILD_DIR)/$(libvpx_dir)/ \
 	&&  host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \
-	&& SYSROOT_PATH=$$SYSROOT_PATH SDK_BIN_PATH=$$SDK_BIN_PATH $(BUILDER_SRC_DIR)/$(libvpx_dir)/configure --prefix=$(prefix) $(libvpx_configure_options)
+	&& export all_platforms="${all_p}" && $(BUILDER_SRC_DIR)/$(libvpx_dir)/configure --prefix=$(prefix) --sdk-path=$$SDK_BIN_PATH/../../ --libc=$$SYSROOT_PATH $(libvpx_configure_options)
 
 build-libvpx: $(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk
-	cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site)  make  && make install
+	cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) make  && make install
 
 clean-libvpx:
 	cd  $(BUILDER_BUILD_DIR)/$(libvpx_dir) && make clean
diff --git a/submodules/build/builders.d/libvpx.patch b/submodules/build/builders.d/libvpx.patch
index d651ccfc8..0cd793f5f 100644
--- a/submodules/build/builders.d/libvpx.patch
+++ b/submodules/build/builders.d/libvpx.patch
@@ -1,29 +1,9 @@
 diff --git a/build/make/configure.sh b/build/make/configure.sh
-index 0426f92..38fdcb2 100755
+index c99a01c..48f8876 100755
 --- a/build/make/configure.sh
 +++ b/build/make/configure.sh
-@@ -624,6 +624,9 @@ process_common_toolchain() {
-     if [ -d "/Developer/SDKs/MacOSX10.7.sdk" ]; then
-         osx_sdk_dir="/Developer/SDKs/MacOSX10.7.sdk"
-     fi
-+    if test -n "$SYSROOT_PATH" ; then
-+        osx_sdk_dir=$SYSROOT_PATH
-+    fi
- 
-     case ${toolchain} in
-         *-darwin8-*)
-@@ -743,9 +746,17 @@ process_common_toolchain() {
-         darwin*)
-             SDK_PATH=/Developer/Platforms/iPhoneOS.platform/Developer
-             TOOLCHAIN_PATH=${SDK_PATH}/usr/bin
-+            if test -n "$SYSROOT_PATH" ; then
-+               SDK_FULL_PATH=$SYSROOT_PATH
-+            else
-+               SDK_FULL_PATH="${SDK_PATH}/SDKs/iPhoneOS5.0.sdk"
-+            fi
-+            if test -n "$SDK_BIN_PATH" ; then
-+                TOOLCHAIN_PATH=$SDK_BIN_PATH
-+            fi
+@@ -892,7 +892,7 @@ process_common_toolchain() {
+             CXX=${TOOLCHAIN_PATH}/g++
              CC=${TOOLCHAIN_PATH}/gcc
              AR=${TOOLCHAIN_PATH}/ar
 -            LD=${TOOLCHAIN_PATH}/arm-apple-darwin10-llvm-gcc-4.2
@@ -31,39 +11,12 @@ index 0426f92..38fdcb2 100755
              AS=${TOOLCHAIN_PATH}/as
              STRIP=${TOOLCHAIN_PATH}/strip
              NM=${TOOLCHAIN_PATH}/nm
-@@ -757,12 +768,12 @@ process_common_toolchain() {
+@@ -904,7 +904,7 @@ process_common_toolchain() {
              ASFLAGS="-version -arch ${tgt_isa} -g"
  
              add_cflags -arch ${tgt_isa}
 -            add_ldflags -arch_only ${tgt_isa}
 +            add_ldflags -arch ${tgt_isa}
  
--            add_cflags  "-isysroot ${SDK_PATH}/SDKs/iPhoneOS5.0.sdk"
-+            add_cflags  "-isysroot $SDK_FULL_PATH"
- 
-             # This should be overridable
--            alt_libc=${SDK_PATH}/SDKs/iPhoneOS5.0.sdk
-+            alt_libc=$SDK_FULL_PATH
- 
-             # Add the paths for the alternate libc
-             for d in usr/include; do
-diff --git a/configure b/configure
-index 6f20c6b..4638ea2 100755
---- a/configure
-+++ b/configure
-@@ -94,6 +94,7 @@ all_platforms="${all_platforms} iwmmxt-linux-gcc"
- all_platforms="${all_platforms} iwmmxt2-linux-rvct"
- all_platforms="${all_platforms} iwmmxt2-linux-gcc"
- all_platforms="${all_platforms} armv7-darwin-gcc"    #neon Cortex-A8
-+all_platforms="${all_platforms} armv7s-darwin-gcc"    #neon Cortex-A8
- all_platforms="${all_platforms} armv7-linux-rvct"    #neon Cortex-A8
- all_platforms="${all_platforms} armv7-linux-gcc"     #neon Cortex-A8
- all_platforms="${all_platforms} armv7-none-rvct"     #neon Cortex-A8
-@@ -198,6 +199,7 @@ ARCH_EXT_LIST="
-     armv5te
-     armv6
-     armv7
-+    armv7s
-     iwmmxt
-     iwmmxt2
- 
+             if [ -z "${alt_libc}" ]; then
+                 alt_libc=${SDK_PATH}/SDKs/iPhoneOS5.1.sdk
diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site
index ea15aad82..125bdebcd 100644
--- a/submodules/build/iphone-config.site
+++ b/submodules/build/iphone-config.site
@@ -27,11 +27,11 @@ else
 	exit
 fi
 echo "Loading config.site for iPhone platform=${PLATFORM} version=${SDK_VERSION}"
-XCODE_ROOT=/Applications/Xcode.app
+XCODE_DEV_PATH=`xcode-select -print-path`
 #new path with Xcode 4.3:
-if test -d ${XCODE_ROOT}/Contents/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs ; then
-	SDK_PATH_LIST=`ls -drt ${XCODE_ROOT}/Contents/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*`
-	SDK_BIN_PATH=${XCODE_ROOT}/Contents/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin  
+if test -d ${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs ; then
+	SDK_PATH_LIST=`ls -drt ${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*`
+	SDK_BIN_PATH=${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin  
 else
 	SDK_PATH_LIST=`ls -drt /Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*`
 	SDK_BIN_PATH=/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin  
diff --git a/submodules/externals/libvpx b/submodules/externals/libvpx
index c8df1656b..b9ce43029 160000
--- a/submodules/externals/libvpx
+++ b/submodules/externals/libvpx
@@ -1 +1 @@
-Subproject commit c8df1656bd94928059204242e778bd5b8b9dc7aa
+Subproject commit b9ce43029298182668d4dcb0e0814189e4a63c2a

From 1de660be1b23339e9b3a18c46a865dfa4d2102ae Mon Sep 17 00:00:00 2001
From: Johan Pascal <johan.pascal@belledonne-communications.com>
Date: Wed, 22 May 2013 23:00:34 +0200
Subject: [PATCH 31/31] AAC-ELD: support PLC and multiple frames per RTP packet
 and fix uninit to free the audio converter.

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 12a3d7951..889ff55a0 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 12a3d795131ab1b367ae000f8b70f9b8af684df6
+Subproject commit 889ff55a035ece493d053d5bd631df560c28c062