Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui

This commit is contained in:
Yann Diorcet 2012-08-01 12:37:54 +02:00
commit 3eea43c947
2 changed files with 3 additions and 3 deletions

View file

@ -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();

@ -1 +1 @@
Subproject commit 14fc5446d03d5cf7a62e8884fa99fd7bbe175ecb
Subproject commit 9a0097a9748862b91448bb71c10c619e122e739a