diff --git a/ChangeLog b/ChangeLog
index bfb5d090e6..85aad67126 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-06-29  Wim Taymans  <wim@fluendo.com>
+
+	* gst/rtsp/gstrtspsrc.c: (gst_rtsp_proto_get_type),
+	(gst_rtspsrc_class_init), (gst_rtspsrc_create_stream),
+	(gst_rtspsrc_add_element), (gst_rtspsrc_set_state),
+	(gst_rtspsrc_stream_setup_rtp),
+	(gst_rtspsrc_stream_configure_transport), (find_stream),
+	(gst_rtspsrc_loop), (gst_rtspsrc_open), (gst_rtspsrc_play),
+	(gst_rtspsrc_change_state):
+	Fix case where outpad could not be decided.
+
 2005-06-29  Andy Wingo  <wingo@pobox.com>
 
 	* ext/Makefile.am (MAD_DIR): Add mad to the build.
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index d2466c35c9..e82d9087e0 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -429,7 +429,7 @@ gst_rtspsrc_loop (GstRTSPSrc * src)
   GList *lstream;
   GstRTSPStream *stream;
   GstPadChainFunction chainfunc;
-  GstPad *outpad;
+  GstPad *outpad = NULL;
   guint8 *data;
   gint size;
 
@@ -462,6 +462,10 @@ gst_rtspsrc_loop (GstRTSPSrc * src)
     outpad = stream->rtpdecrtcp;
   }
 
+  /* we have no clue what this is, just ignore then. */
+  if (outpad == NULL)
+    goto unknown_stream;
+
   /* and chain buffer to internal element */
   {
     GstBuffer *buf;