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

Merge remote-tracking branch 'refs/remotes/origin/master' into ldap

Browse source
This commit is contained in:
Guillaume BIENKOWSKI 2013-12-06 14:33:06 +01:00
commit a29dc547e6
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mediastreamer2

@ -1 +1 @@
Subproject commit 69a7cce94756f9e5af3fae9fbd941817c4731f49
Subproject commit 11eb5f6021a145a8b2f0a65ba409814acfda0f01

2
tester/liblinphone_tester.c
View file

@ -205,7 +205,7 @@ LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_f
else
proxy_count=0;
while (mgr->stat.number_of_LinphoneRegistrationOk<proxy_count && retry++ <(20+ (proxy_count>2?(proxy_count-2)*10:0))) {
while (mgr->stat.number_of_LinphoneRegistrationOk<proxy_count && retry++ <(30+ (proxy_count>2?(proxy_count-2)*10:0))) {
linphone_core_iterate(mgr->lc);
ms_usleep(100000);
}