diff --git a/ChangeLog b/ChangeLog
index 0bab8c96b0..94b846fa49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-27  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* gst/playback/gstdecodebin.c: (close_pad_link):
+	We need to set up delayed-linking whenever the caps are non-fixed,
+	not just when there are multiple types - use gst_pad_is_fixed()
+	to test.
+
 2007-08-26  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst-libs/gst/pbutils/missing-plugins.c:
diff --git a/gst/playback/gstdecodebin.c b/gst/playback/gstdecodebin.c
index c3ee8261fa..2767a06320 100644
--- a/gst/playback/gstdecodebin.c
+++ b/gst/playback/gstdecodebin.c
@@ -749,7 +749,7 @@ close_pad_link (GstElement * element, GstPad * pad, GstCaps * caps,
     GList *to_try;
 
     /* if the caps has many types, we need to delay */
-    if (gst_caps_get_size (caps) != 1)
+    if (!gst_caps_is_fixed (caps))
       goto many_types;
 
     /* continue plugging, first find all compatible elements */