Commit 6d9a3ecc authored by Wim Taymans's avatar Wim Taymans

gst/rtsp/gstrtspsrc.c: the OPTIONS request result is optional so don't fail on it.

Original commit message from CVS:
* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_open):
the OPTIONS request result is optional so don't
fail on it.
parent 0186335d
2006-03-21 Wim Taymans <wim@fluendo.com>
* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_open):
the OPTIONS request result is optional so don't
fail on it.
2006-03-21 Edward Hervey <edward@fluendo.com>
* gst/apetag/gsttagdemux.c: (gst_tag_demux_reset):
......
......@@ -873,6 +873,10 @@ gst_rtspsrc_open (GstRTSPSrc * src)
/* Then maybe Public Header... */
rtsp_message_get_header (&response, RTSP_HDR_PUBLIC, &respoptions);
if (!respoptions) {
/* this field is not required, assume the server supports
* DESCRIBE and SETUP*/
GST_DEBUG_OBJECT (src, "could not get OPTIONS");
src->options = RTSP_DESCRIBE | RTSP_SETUP;
goto no_options;
}
}
......@@ -897,6 +901,7 @@ gst_rtspsrc_open (GstRTSPSrc * src)
}
g_strfreev (options);
no_options:
/* we need describe and setup */
if (!(src->options & RTSP_DESCRIBE))
goto no_describe;
......@@ -1085,12 +1090,6 @@ send_error:
("Could not send message."), (NULL));
return FALSE;
}
no_options:
{
GST_ELEMENT_ERROR (src, RESOURCE, WRITE,
("Invalid OPTIONS response."), (NULL));
return FALSE;
}
no_describe:
{
GST_ELEMENT_ERROR (src, RESOURCE, WRITE,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment