update ms2 and fix incomplete previous bugfix

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 08c5ad930a6dce585b3ac340c2ffbe265d7f1756..bb68bf03e920c298fcc94979976264a8200884ac 100644 (file)
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -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);

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 20eec078321dd193622e4a5244dde16cc95c790f..e7d778b604a061511c9a6612b9dced0175fa5a73 100644 (file)
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -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 

diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index 433d68c5adba416c30f6157b2ad1b8e71893dbc2..49e0ec3cc8c7c1a01e5e233328a8d961d107b8ed 100644 (file)
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -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;
 }
 

diff --git a/mediastreamer2 b/mediastreamer2
index d92d2653b267e5bbdd36047d8011937ee406c66d..0481d7d11e445bf04b095f4adc6d3b76f9e86ee2 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit d92d2653b267e5bbdd36047d8011937ee406c66d
+Subproject commit 0481d7d11e445bf04b095f4adc6d3b76f9e86ee2