mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 19:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:

	coreapi/sal.h
	coreapi/sal_eXosip2_sdp.c
	mediastreamer2
	oRTP
This commit is contained in:
Guillaume Beraudo 2011-10-13 10:58:04 +02:00
parent c3ce65e802
commit 01438658f4
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
coreapi/sal.h
View file

@ -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

1
coreapi/sal_eXosip2_sdp.c
View file

@ -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>

2
mediastreamer2

@ -1 +1 @@
Subproject commit d9957eac4e4409b1eccc65c59b3851542582b718
Subproject commit 9e0fbb21184fcf9396efc444c20d04408500f0d8

2
oRTP

@ -1 +1 @@
Subproject commit 845e0cf4e33cc9964c48aa9191005d4108dfebbd
Subproject commit 5b0d57bb3de5ff1ac1bda6ca5d48f9b1df4047a7