summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2015-07-24 19:24:41 -0400
committerOlivier CrĂȘte <olivier.crete@collabora.com>2015-07-24 19:25:07 -0400
commit28f0e7985cab9e305a32f830f974db0f049a8f51 (patch)
tree5a3d1dfad36fa6e1f6d599a0b1d0169e82e0054c
parente9a20b815d88b6b2aac4bd2ddd2e30dc8a3e6725 (diff)
downloadfarstream-28f0e7985cab9e305a32f830f974db0f049a8f51.tar.gz
rtpstream: Accept everything when no crypto was set
-rw-r--r--gst/fsrtpconference/fs-rtp-stream.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/gst/fsrtpconference/fs-rtp-stream.c b/gst/fsrtpconference/fs-rtp-stream.c
index a6457d89..294a0c8f 100644
--- a/gst/fsrtpconference/fs-rtp-stream.c
+++ b/gst/fsrtpconference/fs-rtp-stream.c
@@ -1516,13 +1516,11 @@ fs_rtp_stream_get_srtp_caps_locked (FsRtpStream *self)
const GValue *v;
GstBuffer *key;
- if (!self->priv->decryption_parameters)
- return NULL;
-
/* This is always TRUE for now, but when we expand to DTLS-SRTP, it may
* not be.
*/
- if (!gst_structure_has_name (self->priv->decryption_parameters,
+ if (!self->priv->decryption_parameters ||
+ !gst_structure_has_name (self->priv->decryption_parameters,
"FarstreamSRTP"))
{
/* Return NULL (drop packets) if encrypted, otherwise return