From 4ff98fde111083f1cab984d50e56811b03cd7922 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 6 Oct 2011 09:29:42 +0200 Subject: [PATCH] srtp: take into account that ortp' srtp.h has been renamed ortp_srtp.h --- coreapi/sal.h | 2 +- coreapi/sal_eXosip2_sdp.c | 2 +- mediastreamer2 | 2 +- oRTP | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coreapi/sal.h b/coreapi/sal.h index e4d10fe86..86a0fb86b 100644 --- a/coreapi/sal.h +++ b/coreapi/sal.h @@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define sal_h #include "mediastreamer2/mscommon.h" -#include "ortp/srtp.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 813e9da1a..f67fb9cfd 100644 --- a/coreapi/sal_eXosip2_sdp.c +++ b/coreapi/sal_eXosip2_sdp.c @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "ortp/b64.h" -#include "ortp/srtp.h" +#include "ortp/ortp_srtp.h" #include "sal.h" #include diff --git a/mediastreamer2 b/mediastreamer2 index f12d0e725..481d921f3 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit f12d0e725229865004d8276ae307aab240f7392c +Subproject commit 481d921f343086a8e634cd5b7241363c4f07b5fa diff --git a/oRTP b/oRTP index 22b2d1e2c..13450079c 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 22b2d1e2c3a694d6adca219ffe229d8783416cd6 +Subproject commit 13450079c956cac404f9c8f19bc1132f73cfca79