diff --git a/ChangeLog b/ChangeLog
index 242642f43d..12d2965830 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-07-11  Andy Wingo  <wingo@pobox.com>
+
+	* gst/audioconvert/gstaudioconvert.c (gst_audio_convert_link): For
+	float, "any" caps -> buffer_frames=[0,MAX].
+
+	* gst/interleave/interleave.c (interleave_getcaps): Seems the core
+	doesn't intersect our caps with the template any more. Do it
+	ourselves.
+	(interleave_buffered_loop): Use g_newa instead of malloc/free.
+
 2004-07-09  Wim Taymans  <wim@fluendo.com>
 
 	* examples/seeking/seek.c: (iterate):
diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c
index 28d1df393e..8c100669cb 100644
--- a/gst/audioconvert/gstaudioconvert.c
+++ b/gst/audioconvert/gstaudioconvert.c
@@ -403,7 +403,8 @@ gst_audio_convert_link (GstPad * pad, const GstCaps * caps)
         gst_structure_set (structure, "buffer-frames", G_TYPE_INT,
             ac_caps.buffer_frames, NULL);
       } else {
-        gst_structure_set (structure, "buffer-frames", G_TYPE_INT, 0, NULL);
+        gst_structure_set (structure, "buffer-frames", GST_TYPE_INT_RANGE, 0,
+            G_MAXINT, NULL);
       }
     }
   }