From 8d13609402005159f229fc6f34a57a8cfcf74fd8 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 15 Dec 2014 16:02:27 +0100 Subject: [PATCH] various ice fix for better interwork --- coreapi/bellesip_sal/sal_sdp.c | 2 +- coreapi/linphonecall.c | 3 ++- mediastreamer2 | 2 +- oRTP | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/coreapi/bellesip_sal/sal_sdp.c b/coreapi/bellesip_sal/sal_sdp.c index 67a583a31..6023ef7e4 100644 --- a/coreapi/bellesip_sal/sal_sdp.c +++ b/coreapi/bellesip_sal/sal_sdp.c @@ -253,7 +253,7 @@ static void stream_description_to_sdp ( belle_sdp_session_description_t *session belle_sdp_media_description_add_attribute(media_desc, belle_sdp_attribute_create("fingerprint",stream->dtls_fingerprint)); } - belle_sdp_media_description_add_attribute(media_desc, belle_sdp_attribute_create("ssrc",ssrc_attribute)); + /*belle_sdp_media_description_add_attribute(media_desc, belle_sdp_attribute_create("ssrc",ssrc_attribute));*/ ms_free(ssrc_attribute); } diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index 964f6e30f..131a3a933 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -854,6 +854,7 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro else call->me=linphone_call_log_get_from_address(call->log); + linphone_address_ref(call->me); /*reserve the sockets immediately*/ linphone_call_init_media_streams(call); @@ -1140,7 +1141,7 @@ static void linphone_call_destroy(LinphoneCall *obj){ obj->remote_params=NULL; } if (obj->me) { - linphone_address_destroy(obj->me); + linphone_address_unref(obj->me); obj->me = NULL; } diff --git a/mediastreamer2 b/mediastreamer2 index d7e7fb21f..d2d7291eb 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit d7e7fb21f2c45e32e641ca4349ca5f1242ee4fe8 +Subproject commit d2d7291eb0dece51a68dfd2b8d005618e945c73b diff --git a/oRTP b/oRTP index 2c94d5783..f4d6250a9 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 2c94d5783a48efda91191c922e077560f3df5876 +Subproject commit f4d6250a9de606025669f6caa6819c7d8d0cd77d