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

fix crash in ms2

Browse source
This commit is contained in:
Simon Morlat 2013-11-20 16:27:23 +01:00
parent 41e358f976
commit c47812993d
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
coreapi/linphonecore.c
View file

@ -942,6 +942,7 @@ static void build_video_devices_table(LinphoneCore *lc){
static void video_config_read(LinphoneCore *lc){
#ifdef VIDEO_ENABLED
int capture, display, self_view;
int automatic_video=1;
#endif
const char *str;
#ifdef VIDEO_ENABLED
@ -958,11 +959,14 @@ static void video_config_read(LinphoneCore *lc){
lp_config_get_string(lc->config,"video","size","cif"));
#ifdef VIDEO_ENABLED
#if defined(ANDROID) || defined(__ios)
automatic_video=0;
#endif
capture=lp_config_get_int(lc->config,"video","capture",1);
display=lp_config_get_int(lc->config,"video","display",1);
self_view=lp_config_get_int(lc->config,"video","self_view",1);
vpol.automatically_initiate=lp_config_get_int(lc->config,"video","automatically_initiate",1);
vpol.automatically_accept=lp_config_get_int(lc->config,"video","automatically_accept",1);
vpol.automatically_initiate=lp_config_get_int(lc->config,"video","automatically_initiate",automatic_video);
vpol.automatically_accept=lp_config_get_int(lc->config,"video","automatically_accept",automatic_video);
linphone_core_enable_video_capture(lc, capture);
linphone_core_enable_video_display(lc, display);
linphone_core_enable_video_preview(lc,lp_config_get_int(lc->config,"video","show_local",0));

2
mediastreamer2

@ -1 +1 @@
Subproject commit 785a5d8f76c336a51f8a21997e9dcaee669d4ec4
Subproject commit c1be4195ccc127199d3541a7a5e7ce0351fcde63