diff --git a/ChangeLog b/ChangeLog
index 5b00c16197..e290aa4658 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2005-05-17  Wim Taymans  <wim@fluendo.com>
+
+	* gst-libs/gst/audio/gstaudiofilter.c: (gst_audiofilter_link),
+	(gst_audiofilter_chain):
+	* gst-libs/gst/audio/gstaudiosink.c:
+	(gst_audioringbuffer_get_type), (gst_audioringbuffer_class_init),
+	(audioringbuffer_thread_func), (gst_audioringbuffer_init),
+	(gst_audioringbuffer_acquire), (gst_audioringbuffer_release),
+	(gst_audioringbuffer_play), (gst_audioringbuffer_stop),
+	(gst_audioringbuffer_delay), (gst_audiosink_class_init),
+	(gst_audiosink_create_ringbuffer):
+	* gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_chain),
+	(gst_audio_convert_caps_remove_format_info),
+	(gst_audio_convert_getcaps), (gst_audio_convert_setcaps),
+	(gst_audio_convert_fixate), (gst_audio_convert_channels):
+	* gst/ffmpegcolorspace/gstffmpegcolorspace.c:
+	(gst_ffmpegcsp_getcaps), (gst_ffmpegcsp_configure_context),
+	(gst_ffmpegcsp_setcaps), (gst_ffmpegcsp_chain):
+	Fix passthrough in ffmpegcolorspace.
+	Fix memset in audiosink on wrong memory.
+
 2005-05-16  David Schleef  <ds@schleef.org>
 
 	* gst/playback/gststreaminfo.c: (cb_probe): Port from GstData
diff --git a/gst-libs/gst/audio/gstaudiosink.c b/gst-libs/gst/audio/gstaudiosink.c
index a3c2e23dbd..b924beda2d 100644
--- a/gst-libs/gst/audio/gstaudiosink.c
+++ b/gst-libs/gst/audio/gstaudiosink.c
@@ -255,7 +255,7 @@ gst_audioringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
   spec->segtotal++;
 
   buf->data = gst_buffer_new_and_alloc (spec->segtotal * spec->segsize);
-  memset (GST_BUFFER_DATA (buf), 0, GST_BUFFER_SIZE (buf));
+  memset (GST_BUFFER_DATA (buf->data), 0, GST_BUFFER_SIZE (buf->data));
 
   sink->thread =
       g_thread_create ((GThreadFunc) audioringbuffer_thread_func, buf, TRUE,
diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.c b/gst/ffmpegcolorspace/gstffmpegcolorspace.c
index c492cf76a9..61c388d72a 100644
--- a/gst/ffmpegcolorspace/gstffmpegcolorspace.c
+++ b/gst/ffmpegcolorspace/gstffmpegcolorspace.c
@@ -254,8 +254,7 @@ gst_ffmpegcsp_setcaps (GstPad * pad, GstCaps * caps)
   otherpeer = gst_pad_get_peer (otherpad);
   if (otherpeer) {
     /* check passthrough */
-    //if (gst_pad_accept_caps (otherpeer, caps)) {
-    if (FALSE) {
+    if (gst_pad_accept_caps (otherpeer, caps)) {
       *other_prefered = gst_caps_ref (caps);
     } else {
       GstCaps *othercaps;