srtp: take into account that ortp' srtp.h has been renamed ortp_srtp.h

Conflicts:

	coreapi/sal.h
	coreapi/sal_eXosip2_sdp.c
	mediastreamer2
	oRTP

diff --git a/coreapi/sal.h b/coreapi/sal.h
index 140c14d045dd2732cb1e0b94512638601529e85a..b2a0ecd595f126b1225c0d4eddd3cd1e4376546f 100644 (file)
--- a/coreapi/sal.h
+++ b/coreapi/sal.h
@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define sal_h
 
 #include "mediastreamer2/mscommon.h"
+#include "ortp/ortp_srtp.h"
 
 /*Dirty hack, keep in sync with mediastreamer2/include/mediastream.h */
 #ifndef PAYLOAD_TYPE_FLAG_CAN_RECV

diff --git a/coreapi/sal_eXosip2_sdp.c b/coreapi/sal_eXosip2_sdp.c
index 3993e66f8179514c9b2e2b8b742d4791e9dbd9e4..5160777a782ee4f88f07a32eb0046082578f502a 100644 (file)
--- a/coreapi/sal_eXosip2_sdp.c
+++ b/coreapi/sal_eXosip2_sdp.c
@@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 #include "ortp/b64.h"
+#include "ortp/ortp_srtp.h"
 #include "sal.h"
 #include <eXosip2/eXosip.h>
 

diff --git a/mediastreamer2 b/mediastreamer2
index d9957eac4e4409b1eccc65c59b3851542582b718..9e0fbb21184fcf9396efc444c20d04408500f0d8 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit d9957eac4e4409b1eccc65c59b3851542582b718
+Subproject commit 9e0fbb21184fcf9396efc444c20d04408500f0d8

diff --git a/oRTP b/oRTP
index 845e0cf4e33cc9964c48aa9191005d4108dfebbd..5b0d57bb3de5ff1ac1bda6ca5d48f9b1df4047a7 160000 (submodule)
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 845e0cf4e33cc9964c48aa9191005d4108dfebbd
+Subproject commit 5b0d57bb3de5ff1ac1bda6ca5d48f9b1df4047a7