From 05557306aadb0a58fca3621fa71829e387be2da8 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 19 Mar 2018 17:40:45 +0100 Subject: [PATCH] Update linphone and mediastreamer2, re-enable ICE. [--force] because I switch linphone submodule on branch dev_refactor_cpp --- Resources/linphonerc-factory | 2 +- submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index 1aae754de..99364ce06 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -27,7 +27,7 @@ password_length=-1 username_length=-1 [net] -force_ice_disablement=1 +force_ice_disablement=0 download_bw=0 upload_bw=0 diff --git a/submodules/linphone b/submodules/linphone index 6d6ee9691..29f9de93a 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 6d6ee9691c19febf5e8a092239fa7d1e0cd5388b +Subproject commit 29f9de93a30c6f7278ae4c0356fa7a4303832c2c diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index e20c2ed9a..f49b3d5ea 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit e20c2ed9a7397e5d6cc9ed4cbf3539761ae35111 +Subproject commit f49b3d5ea3ab56b4b021a760a58f44015b3c5765