From 6eb424a5dfa67e810e0be7aa1c377e2f4e8d370a Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 31 Jul 2012 16:26:51 +0200 Subject: [PATCH] fix IOS camera localized name issue Conflicts: Classes/LinphoneUI/LinphoneManager.m --- Classes/LinphoneManager.m | 4 ++-- submodules/linphone | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 408fee075..2086a32a3 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -47,8 +47,8 @@ extern void libmsamr_init(); #ifdef HAVE_X264 extern void libmsx264_init(); #endif -#define FRONT_CAM_NAME "AV Capture: Front Camera" -#define BACK_CAM_NAME "AV Capture: Back Camera" +#define FRONT_CAM_NAME "AV Capture: com.apple.avfoundation.avcapturedevice.built-in_video:1" /*"AV Capture: Front Camera"*/ +#define BACK_CAM_NAME "AV Capture: com.apple.avfoundation.avcapturedevice.built-in_video:0" /*"AV Capture: Back Camera"*/ #if defined (HAVE_SILK) extern void libmssilk_init(); diff --git a/submodules/linphone b/submodules/linphone index 14fc5446d..9a0097a97 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 14fc5446d03d5cf7a62e8884fa99fd7bbe175ecb +Subproject commit 9a0097a9748862b91448bb71c10c619e122e739a