From a8eb0515f1e3b096f978189cfd3cd01d576f390f Mon Sep 17 00:00:00 2001 From: Matt Staples Date: Tue, 10 Jan 2017 09:40:56 -0700 Subject: [PATCH] rtspsrc: find_stream_by_channel should ignore unconfigured streams https://bugzilla.gnome.org/show_bug.cgi?id=777101 --- gst/rtsp/gstrtspsrc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c index 7725fe1..35bd8c6 100644 --- a/gst/rtsp/gstrtspsrc.c +++ b/gst/rtsp/gstrtspsrc.c @@ -1339,7 +1339,10 @@ find_stream_by_id (GstRTSPStream * stream, gint * id) static gint find_stream_by_channel (GstRTSPStream * stream, gint * channel) { - if (stream->channel[0] == *channel || stream->channel[1] == *channel) + /* ignore unconfigured channels here (e.g., those that + * were explicitly skipped during SETUP) */ + if ((stream->channelpad[0] != NULL) && + (stream->channel[0] == *channel || stream->channel[1] == *channel)) return 0; return -1; -- 2.7.4