update ms2

diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c
index f4830934d5ec5c3b615c11524bdde2b1981e3c9f..203c7cb92c48862b75494f37003b5a2b0d8c178f 100644 (file)
--- a/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@ -397,12 +397,12 @@ int sal_listen_port(Sal *ctx, const char *addr, int port, SalTransport tr, int i
        switch (tr) {
        case SalTransportUDP:
                proto=IPPROTO_UDP;
-               eXosip_set_option (EXOSIP_OPT_UDP_KEEP_ALIVE, &keepalive);      
+               eXosip_set_option (EXOSIP_OPT_UDP_KEEP_ALIVE, &keepalive);
                break;
        case SalTransportTCP:
        case SalTransportTLS:
                proto= IPPROTO_TCP;
-                       keepalive=-1;   
+               keepalive=-1;
                eXosip_set_option (EXOSIP_OPT_UDP_KEEP_ALIVE,&keepalive);
                set_tls_options(ctx);
                break;

diff --git a/mediastreamer2 b/mediastreamer2
index 3f8ccb0f4f3509ceeb486e8da9528a9bde1471e2..6874ac86f173b5cf57b87e5ee529652ba6676295 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 3f8ccb0f4f3509ceeb486e8da9528a9bde1471e2
+Subproject commit 6874ac86f173b5cf57b87e5ee529652ba6676295