From 3488b92f317b07266c71cb0c3a0d7450c62b91e9 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 4 Nov 2014 13:59:28 +0100 Subject: [PATCH] update ms2 and documentation --- coreapi/linphonecore.c | 5 ++++- mediastreamer2 | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index b09037bf2..340f589fc 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -4606,7 +4606,10 @@ const char * linphone_core_get_ringback(const LinphoneCore *lc){ } /** - * Enables or disable echo cancellation. Value is saved an used for subsequent calls + * Enables or disable echo cancellation. Value is saved and used for subsequent calls. + * This actually controls software echo cancellation. If hardware echo cancellation is available, it will be always used and activated for calls, regardless + * of the value passed to this function. + * When hardware echo cancellation is available, the software one is of course not activated. * * @ingroup media_parameters **/ diff --git a/mediastreamer2 b/mediastreamer2 index b8bf1d43d..f74295ef1 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit b8bf1d43de8c3e3aece04bf1aa6600c0130c055d +Subproject commit f74295ef1a01ec50fa46aac5ab891527a33d8eb6