mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-03 20:46:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

update ms2 and fix incomplete previous bugfix

Browse source
This commit is contained in:
Simon Morlat 2012-03-09 18:43:08 +01:00
parent 96c8389412
commit 714f307043
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
coreapi/linphonecall.c
View file

@ -287,6 +287,7 @@ static int find_port_offset(LinphoneCore *lc){
static void linphone_call_init_common(LinphoneCall *call, LinphoneAddress *from, LinphoneAddress *to){
int port_offset;
call->magic=linphone_call_magic;
call->refcnt=1;
call->state=LinphoneCallIdle;
call->start_time=time(NULL);

2
coreapi/linphonecore.c
View file

@ -2353,7 +2353,7 @@ int linphone_core_defer_call_update(LinphoneCore *lc, LinphoneCall *call){
* have the time to prompt the user. linphone_call_get_remote_params() can be used to get information about the call parameters
* requested by the other party, such as whether a video stream is requested.
*
* When the user accepts or refuse the change, linphone_core_accept_update() can be done to answer to the other party.
* When the user accepts or refuse the change, linphone_core_accept_call_update() can be done to answer to the other party.
* If params is NULL, then the same call parameters established before the update request will continue to be used (no change).
* If params is not NULL, then the update will be accepted according to the parameters passed.
* Typical example is when a user accepts to start video, then params should indicate that video stream should be used

1
coreapi/proxy.c
View file

@ -44,6 +44,7 @@ void linphone_proxy_config_write_all_to_config_file(LinphoneCore *lc){
void linphone_proxy_config_init(LinphoneProxyConfig *obj){
memset(obj,0,sizeof(LinphoneProxyConfig));
obj->magic=linphone_proxy_config_magic;
obj->expires=3600;
}

2
mediastreamer2

@ -1 +1 @@
Subproject commit d92d2653b267e5bbdd36047d8011937ee406c66d
Subproject commit 0481d7d11e445bf04b095f4adc6d3b76f9e86ee2