diff --git a/ChangeLog b/ChangeLog
index 06682c6003..9aa169da5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-03  Tim-Philipp Müller <t.i.m@zen.co.uk>
+
+	reviewed by: David Schleef  <ds@schleef.org>
+
+	* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register):  Fix
+	memleaks (bug #138985)
+
 2004-03-29  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* ext/ffmpeg/*.c: indent
diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index 8b9a6a7bf1..d2377e7713 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -711,6 +711,8 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
 
     /* if it's already registered, drop it */
     if (g_type_from_name (type_name)) {
+      gst_caps_free (videosrccaps);
+      gst_caps_free (audiosrccaps);
       g_free (type_name);
       goto next;
     }
@@ -745,6 +747,8 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
       return FALSE;
     }
 
+    g_free (type_name);
+    g_free (typefind_name);
     if (extensions)
       g_strfreev (extensions);