diff --git a/ChangeLog b/ChangeLog
index 314f39490b..8f2752a5cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-04  David Schleef  <ds@schleef.org>
+
+	Fix the fixate functions to handle new prototype:
+	* gst/sine/gstsinesrc.c: (gst_sinesrc_src_fixate):
+	* gst/videotestsrc/gstvideotestsrc.c:
+	(gst_videotestsrc_src_fixate):
+	* sys/oss/gstosssink.c: (gst_osssink_sink_fixate):
+	* sys/ximage/ximagesink.c: (gst_ximagesink_fixate):
+	* sys/xvimage/xvimagesink.c: (gst_xvimagesink_fixate):
+
 2004-01-04  Benjamin Otte  <in7y118@public.uni-hamburg.de>
 
 	* sys/ximage/ximagesink.h:
diff --git a/gst/sine/gstsinesrc.c b/gst/sine/gstsinesrc.c
index eae6345c48..36f7244af7 100644
--- a/gst/sine/gstsinesrc.c
+++ b/gst/sine/gstsinesrc.c
@@ -99,7 +99,7 @@ static gboolean     gst_sinesrc_src_query           (GstPad      *pad,
 						     gint64      *value);
 
 static GstData*   gst_sinesrc_get		    (GstPad *pad);
-static GstCaps * gst_sinesrc_src_fixate (GstPad *pad, const GstCaps *caps, gpointer user_data);
+static GstCaps * gst_sinesrc_src_fixate (GstPad *pad, const GstCaps *caps);
 
 static GstElementClass *parent_class = NULL;
 /*static guint gst_sinesrc_signals[LAST_SIGNAL] = { 0 }; */
@@ -216,8 +216,7 @@ gst_sinesrc_init (GstSineSrc *src)
 }
 
 static GstCaps *
-gst_sinesrc_src_fixate (GstPad *pad, const GstCaps *caps,
-    gpointer user_data)
+gst_sinesrc_src_fixate (GstPad *pad, const GstCaps *caps)
 {
   GstStructure *structure;
   GstCaps *newcaps;
diff --git a/gst/videotestsrc/gstvideotestsrc.c b/gst/videotestsrc/gstvideotestsrc.c
index 8f37587b3a..f9a7fe2589 100644
--- a/gst/videotestsrc/gstvideotestsrc.c
+++ b/gst/videotestsrc/gstvideotestsrc.c
@@ -194,8 +194,7 @@ gst_videotestsrc_set_clock (GstElement *element, GstClock *clock)
 }
 
 static GstCaps *
-gst_videotestsrc_src_fixate (GstPad * pad, const GstCaps * caps,
-    gpointer user_data)
+gst_videotestsrc_src_fixate (GstPad * pad, const GstCaps * caps)
 {
   GstStructure *structure;
   GstCaps *newcaps;
diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index 64463b4045..b9eb7504c5 100644
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -510,7 +510,7 @@ gst_ximagesink_xcontext_clear (GstXImageSink *ximagesink)
 /* Element stuff */
 
 static GstCaps *
-gst_ximagesink_fixate (GstPad *pad, const GstCaps *caps, gpointer ignore)
+gst_ximagesink_fixate (GstPad *pad, const GstCaps *caps)
 {
   GstStructure *structure;
   GstCaps *newcaps;
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index fc41d39d6b..27de14cd4b 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -605,7 +605,7 @@ gst_xvimagesink_xcontext_clear (GstXvImageSink *xvimagesink)
 /* Element stuff */
 
 static GstCaps *
-gst_xvimagesink_fixate (GstPad *pad, const GstCaps *caps, gpointer ignore)
+gst_xvimagesink_fixate (GstPad *pad, const GstCaps *caps)
 {
   GstStructure *structure;
   GstCaps *newcaps;