mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-21 13:08:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git.linphone.org:linphone

Browse source
This commit is contained in:
Yann Diorcet 2012-05-22 14:30:11 +02:00
commit 62430e4fe2
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
coreapi/linphonecore.c
View file

@ -773,8 +773,9 @@ static void video_config_read(LinphoneCore *lc){
int capture, display, self_view;
#endif
const char *str;
#ifdef VIDEO_ENABLED
LinphoneVideoPolicy vpol;
#endif
build_video_devices_table(lc);
str=lp_config_get_string(lc->config,"video","device",NULL);

2
mediastreamer2

@ -1 +1 @@
Subproject commit 14187df4b75733457792b9b1f1dab6cbf852b45b
Subproject commit 3279ea72e4938b7b9977e885cd990e981780ef80