mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
Original commit message from CVS:
* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_open):
the OPTIONS request result is optional so don't
fail on it.
This commit is contained in:
Wim Taymans 2006-03-21 16:19:37 +00:00
parent 0186335dd2
commit 6d9a3ecc4c
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
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):

11
gst/rtsp/gstrtspsrc.c
View file

@ -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,