Merge branch 'master' of git://git.linphone.org/linphone

diff --git a/coreapi/sal_eXosip2_sdp.c b/coreapi/sal_eXosip2_sdp.c
index 2b439c000ae31fbbf0532d223f630ef8320c200b..050a53a764dd6c58cddbdffeee1cbe3fc62fd245 100644 (file)
--- a/coreapi/sal_eXosip2_sdp.c
+++ b/coreapi/sal_eXosip2_sdp.c
@@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 
+#include "ortp/port.h"
 #include "ortp/b64.h"
 #include "ortp/ortp_srtp.h"
 #include "sal.h"

diff --git a/mediastreamer2 b/mediastreamer2
index c6f2baffe88cae29cd846b95269c37b736626fab..85dee13777a3c62ec25d144b9fbd598c79495a48 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit c6f2baffe88cae29cd846b95269c37b736626fab
+Subproject commit 85dee13777a3c62ec25d144b9fbd598c79495a48

diff --git a/oRTP b/oRTP
index 4934d1de87717914042bbed8445a33c192d9d1ef..6a31e56e1f32f8ca82592e1f4301cd799a9751ea 160000 (submodule)
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 4934d1de87717914042bbed8445a33c192d9d1ef
+Subproject commit 6a31e56e1f32f8ca82592e1f4301cd799a9751ea