diff --git a/ChangeLog b/ChangeLog
index 24180cc43c..365086dc2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-04-22  Benjamin Otte  <otte@gnome.org>
+
+	* ext/hermes/gsthermescolorspace.c:
+	(gst_hermes_colorspace_caps_remove_format_info):
+	* gst/colorspace/gstcolorspace.c:
+	(gst_colorspace_caps_remove_format_info):
+	* gst/ffmpegcolorspace/gstffmpegcolorspace.c:
+	(gst_ffmpegcolorspace_caps_remove_format_info):
+	  s/gst_caps_simplify/gst_caps_do_simplify/
+
 2004-04-22  Benjamin Otte  <otte@gnome.org>
 
 	* gst-libs/gst/riff/riff-media.c:
diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.c b/gst/ffmpegcolorspace/gstffmpegcolorspace.c
index 1960081df4..ce0f337a77 100644
--- a/gst/ffmpegcolorspace/gstffmpegcolorspace.c
+++ b/gst/ffmpegcolorspace/gstffmpegcolorspace.c
@@ -125,9 +125,8 @@ gst_ffmpegcolorspace_caps_remove_format_info (GstCaps * caps)
     gst_structure_remove_field (structure, "blue_mask");
   }
 
-  rgbcaps = gst_caps_simplify (caps);
-  gst_caps_free (caps);
-  caps = gst_caps_copy (rgbcaps);
+  gst_caps_do_simplify (caps);
+  rgbcaps = gst_caps_copy (caps);
 
   for (i = 0; i < gst_caps_get_size (rgbcaps); i++) {
     structure = gst_caps_get_structure (rgbcaps, i);