diff --git a/ChangeLog b/ChangeLog
index a6249870eb..ee6789b853 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-22  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	Patch by: Jan Schmidt
+
+	* gst/playback/gststreamselector.c:
+	(gst_stream_selector_bufferalloc):
+	  Restore old StreamSelector behaviour.
+	  Fixes #338419.
+
 2006-04-12  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac:
diff --git a/gst/playback/gststreamselector.c b/gst/playback/gststreamselector.c
index c68245f786..672964fa6e 100644
--- a/gst/playback/gststreamselector.c
+++ b/gst/playback/gststreamselector.c
@@ -301,13 +301,14 @@ gst_stream_selector_bufferalloc (GstPad * pad, guint64 offset,
   active_sinkpad = sel->active_sinkpad;
   GST_OBJECT_UNLOCK (sel);
 
-  /* Ignore buffers from pads except the selected one */
+  /* Fallback allocation for buffers from pads except the selected one */
   if (pad != active_sinkpad) {
     GST_DEBUG_OBJECT (sel,
-        "Returning not-linked for buffer alloc from pad %s:%s",
+        "Pad %s:%s is not selected. Performing fallback allocation",
         GST_DEBUG_PAD_NAME (pad));
 
-    result = GST_FLOW_NOT_LINKED;
+    *buf = NULL;
+    result = GST_FLOW_OK;
   } else {
     result = gst_pad_alloc_buffer (sel->srcpad, offset, size, caps, buf);