diff --git a/ChangeLog b/ChangeLog
index 4f27f314d6..5e5322315e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-16  Sebastien Cote  <sc5@hermes.usherb.ca>
+
+	Reviewed by:  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* ext/ffmpeg/gstffmpegcolorspace.c: (gst_ffmpegcsp_pad_link):
+	  Fix memleak (#154815).
+
 2004-12-16  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* ext/ffmpeg/gstffmpegcolorspace.c: (gst_ffmpegcsp_pad_link),
diff --git a/ext/ffmpeg/gstffmpegcolorspace.c b/ext/ffmpeg/gstffmpegcolorspace.c
index 4a564524ae..ffe35832d4 100644
--- a/ext/ffmpeg/gstffmpegcolorspace.c
+++ b/ext/ffmpeg/gstffmpegcolorspace.c
@@ -230,6 +230,7 @@ gst_ffmpegcsp_pad_link (GstPad * pad, const GstCaps * caps)
           gst_value_get_fraction_denominator (par), NULL);
     }
     ret = gst_pad_try_set_caps (otherpad, caps);
+    gst_caps_free (caps);
     if (GST_PAD_LINK_FAILED (ret)) {
       return ret;
     }