diff --git a/ChangeLog b/ChangeLog
index fa878b557c9..52109b89cab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-24  Colin Walters  <walters@verbum.org>
+
+	* sys/oss/gstosssink.c (gst_osssink_sink_fixate): Return NULL if
+	we can't fixate the caps anymore.
+
 2003-12-23  David Schleef  <ds@schleef.org>
 
 	* gst/volume/gstvolume.c: (volume_init): Proxy getcaps.
diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c
index 9985427c809..96ed3d1a1c8 100644
--- a/sys/oss/gstosssink.c
+++ b/sys/oss/gstosssink.c
@@ -237,7 +237,9 @@ gst_osssink_sink_fixate (GstPad *pad, const GstCaps *caps, gpointer user_data)
     return newcaps;
   }
 
-  return newcaps;
+  gst_caps_free (newcaps);
+
+  return NULL;
 }
 
 static GstPadLinkReturn