summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2014-10-28 15:18:19 -0400
committerOlivier CrĂȘte <olivier.crete@collabora.com>2014-10-28 15:18:49 -0400
commitbf84ab63c8313d2c7299c82928dbfa528448062b (patch)
tree615b2b746211d8b7321a8a0497f68ceecf4cee14 /gst
parent15dc8ef0efc871e4af7f7c661b05e081b6062d17 (diff)
downloadfarstream-bf84ab63c8313d2c7299c82928dbfa528448062b.tar.gz
rtpsession: Don't try to return srtpenc/dec if not installed
https://bugs.freedesktop.org/show_bug.cgi?id=85566
Diffstat (limited to 'gst')
-rw-r--r--gst/fsrtpconference/fs-rtp-session.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 8a20180f..a465cfa0 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -1167,7 +1167,7 @@ _rtpbin_request_encoder (GstElement *rtpbin, guint session_id,
{
FsRtpSession *self = FS_RTP_SESSION (user_data);
- if (self->id == session_id) {
+ if (self->id == session_id && self->priv->srtpenc) {
return gst_object_ref (self->priv->srtpenc);
} else {
return NULL;
@@ -1180,7 +1180,7 @@ _rtpbin_request_decoder (GstElement *rtpbin, guint session_id,
{
FsRtpSession *self = FS_RTP_SESSION (user_data);
- if (self->id == session_id)
+ if (self->id == session_id && self->priv->srtpdec)
return gst_object_ref (self->priv->srtpdec);
else
return NULL;