update ms2 for conference fixes

diff --git a/coreapi/conference.c b/coreapi/conference.c
index 288ab2b46ca1a9cc5e6e9d7ad46064a0b41666e3..4c7b0bffdaa12676e53a7f989f9d185e89b4380b 100644 (file)
--- a/coreapi/conference.c
+++ b/coreapi/conference.c
@@ -164,6 +164,7 @@ int linphone_core_add_to_conference(LinphoneCore *lc, LinphoneCall *call){
 
 int linphone_core_remove_from_conference(LinphoneCore *lc, LinphoneCall *call){
        int err=0;
+
        if (!call->current_params.in_conference){
                if (call->params.in_conference){
                        ms_warning("Not (yet) in conference, be patient");

diff --git a/mediastreamer2 b/mediastreamer2
index b5944d8d25bec0acd992288fee03a5016a6b02ca..ff1da8a73459c0239c89e40e4655cbf234fb36d8 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit b5944d8d25bec0acd992288fee03a5016a6b02ca
+Subproject commit ff1da8a73459c0239c89e40e4655cbf234fb36d8