summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--gst/rtsp/gstrtspsrc.c12
2 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ce3f28b..6f76f8cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-11 Wim Taymans <wim@fluendo.com>
+
+ Patch by: Lutz Mueller <lutz at topfrose dot de>
+
+ * gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_activate_streams):
+ Check for stream pad before activating.
+
2007-01-10 Wim Taymans <wim@fluendo.com>
Patch by: Peter Kjellerstedt <pkj at axis com>
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index 1ec70b88..96fd79ee 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -1122,11 +1122,13 @@ gst_rtspsrc_activate_streams (GstRTSPSrc * src)
for (walk = src->streams; walk; walk = g_list_next (walk)) {
GstRTSPStream *stream = (GstRTSPStream *) walk->data;
- gst_pad_set_active (stream->srcpad, TRUE);
- /* add the pad */
- if (!stream->added) {
- gst_element_add_pad (GST_ELEMENT_CAST (src), stream->srcpad);
- stream->added = TRUE;
+ if (stream->srcpad) {
+ gst_pad_set_active (stream->srcpad, TRUE);
+ /* add the pad */
+ if (!stream->added) {
+ gst_element_add_pad (GST_ELEMENT_CAST (src), stream->srcpad);
+ stream->added = TRUE;
+ }
}
}