rtspsrc: handle NULL control urls better

This commit is contained in:
Wim Taymans 2014-03-05 15:44:25 +01:00
parent d2f93e3afc
commit 99a9d2873c

View file

@ -1170,16 +1170,20 @@ find_stream_by_udpsrc (GstRTSPStream * stream, gconstpointer a)
static gint static gint
find_stream_by_setup (GstRTSPStream * stream, gconstpointer a) find_stream_by_setup (GstRTSPStream * stream, gconstpointer a)
{ {
/* check qualified setup_url */ if (stream->conninfo.location) {
if (!strcmp (stream->conninfo.location, (gchar *) a)) /* check qualified setup_url */
return 0; if (!strcmp (stream->conninfo.location, (gchar *) a))
/* check original control_url */ return 0;
if (!strcmp (stream->control_url, (gchar *) a)) }
return 0; if (stream->control_url) {
/* check original control_url */
if (!strcmp (stream->control_url, (gchar *) a))
return 0;
/* check if qualified setup_url ends with string */ /* check if qualified setup_url ends with string */
if (g_str_has_suffix (stream->control_url, (gchar *) a)) if (g_str_has_suffix (stream->control_url, (gchar *) a))
return 0; return 0;
}
return -1; return -1;
} }