diff --git a/ChangeLog b/ChangeLog
index 419346b252..b916d0be38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-28  David Schleef  <ds@schleef.org>
+
+	* gst/speed/gstspeed.c: (speed_parse_caps):  Fix caps parsing.
+	(bug #140064)
+
 2004-04-28  Ronald Bultje  <rbultje@ronald.bitfreak.net>
 
 	* ext/alsa/gstalsa.c: (gst_alsa_class_probe_devices):
diff --git a/gst/speed/gstspeed.c b/gst/speed/gstspeed.c
index 090d13d0e2..b685bb32a6 100644
--- a/gst/speed/gstspeed.c
+++ b/gst/speed/gstspeed.c
@@ -121,9 +121,9 @@ speed_parse_caps (GstSpeed * filter, const GstCaps * caps)
   ret &= gst_structure_get_int (structure, "channels", &filter->channels);
   ret &= gst_structure_get_int (structure, "width", &filter->width);
   ret &= gst_structure_get_int (structure, "endianness", &filter->endianness);
-  ret &=
-      gst_structure_get_int (structure, "buffer-frames",
-      &filter->buffer_frames);
+
+  filter->buffer_frames = 0;
+  gst_structure_get_int (structure, "buffer-frames", &filter->buffer_frames);
 
   mimetype = gst_structure_get_name (structure);