summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--gst/rtsp/gstrtspsrc.c10
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 260a1e7e..05c74af4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-15 Tim-Philipp Müller <tim at centricular dot net>
+
+ * gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_set_state):
+ Don't try doing state changes on a NULL pointer.
+
2006-07-14 Wim Taymans <wim@fluendo.com>
Patch by: Sebastien Cote <sebas642 at yahoo dot ca>
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index 347e1e51..fd2c476e 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -337,10 +337,12 @@ gst_rtspsrc_set_state (GstRTSPSrc * src, GstState state)
stream = (GstRTSPStream *) streams->data;
/* first our rtp session manager */
- if ((ret =
- gst_element_set_state (stream->rtpdec,
- state)) == GST_STATE_CHANGE_FAILURE)
- goto done;
+ if (stream->rtpdec) {
+ if ((ret =
+ gst_element_set_state (stream->rtpdec,
+ state)) == GST_STATE_CHANGE_FAILURE)
+ goto done;
+ }
/* then our sources */
if (stream->rtpsrc) {