summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2008-09-25 12:07:46 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-09-25 12:07:46 +0000
commitb1dfdc758e04ea8aa70379bbcc9ea9103516d0af (patch)
treea92681bdfce86b18ce2c7f474dd0911145c0133c
parent712cd620af861bfef8344cb2febb45942613594b (diff)
downloadgstreamer-plugins-good-b1dfdc758e04ea8aa70379bbcc9ea9103516d0af.tar.gz
gst/rtsp/gstrtspsrc.c: Don't assume the server supports PAUSE by default. Fixes #551048.
Original commit message from CVS: * gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_parse_methods): Don't assume the server supports PAUSE by default. Fixes #551048.
-rw-r--r--ChangeLog5
-rw-r--r--gst/rtsp/gstrtspsrc.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 301b2b383..43d1559f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-09-25 Wim Taymans <wim.taymans@collabora.co.uk>
+ * gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_parse_methods):
+ Don't assume the server supports PAUSE by default. Fixes #551048.
+
+2008-09-25 Wim Taymans <wim.taymans@collabora.co.uk>
+
* gst/udp/gstudpsrc.c: (gst_udpsrc_class_init),
(gst_udpsrc_set_uri), (gst_udpsrc_start):
Switch on the socket family to get the addrlen size right.
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index c2266ab82..d7ab6f698 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -3550,14 +3550,14 @@ gst_rtspsrc_parse_methods (GstRTSPSrc * src, GstRTSPMessage * response)
if (src->methods == 0) {
/* neither Allow nor Public are required, assume the server supports
- * at least DESCRIBE, SETUP, we always assume it supports PLAY and PAUSE as
+ * at least DESCRIBE, SETUP, we always assume it supports PLAY as
* well. */
GST_DEBUG_OBJECT (src, "could not get OPTIONS");
src->methods = GST_RTSP_DESCRIBE | GST_RTSP_SETUP;
}
- /* always assume PLAY and PAUSED, FIXME, extensions should be able to override
+ /* always assume PLAY, FIXME, extensions should be able to override
* this */
- src->methods |= GST_RTSP_PLAY | GST_RTSP_PAUSE;
+ src->methods |= GST_RTSP_PLAY;
/* we need describe and setup */
if (!(src->methods & GST_RTSP_DESCRIBE))