diff options
author | David Schleef <ds@schleef.org> | 2004-01-04 23:46:39 +0000 |
---|---|---|
committer | David Schleef <ds@schleef.org> | 2004-01-04 23:46:39 +0000 |
commit | 7066aeeae53f4c2c3c3b27609653adbb98cd8a95 (patch) | |
tree | a3a35165634679478480f0532fbaff2a6a937400 | |
parent | b5d58065bd339e8f4daf64ec782220ab2da33b5d (diff) |
Fix the fixate functions to handle new prototype:
Original commit message from CVS:
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):
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | sys/oss/gstosssink.c | 4 |
2 files changed, 12 insertions, 2 deletions
@@ -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/sys/oss/gstosssink.c b/sys/oss/gstosssink.c index 96ed3d1a..efd1e4d1 100644 --- a/sys/oss/gstosssink.c +++ b/sys/oss/gstosssink.c @@ -58,7 +58,7 @@ static gboolean gst_osssink_query (GstElement *element, GstQueryType type, static gboolean gst_osssink_sink_query (GstPad *pad, GstQueryType type, GstFormat *format, gint64 *value); -static GstCaps * gst_osssink_sink_fixate (GstPad *pad, const GstCaps *caps, gpointer user_data); +static GstCaps * gst_osssink_sink_fixate (GstPad *pad, const GstCaps *caps); static GstPadLinkReturn gst_osssink_sinkconnect (GstPad *pad, const GstCaps *caps); static void gst_osssink_set_property (GObject *object, guint prop_id, const GValue *value, @@ -216,7 +216,7 @@ gst_osssink_init (GstOssSink *osssink) } static GstCaps * -gst_osssink_sink_fixate (GstPad *pad, const GstCaps *caps, gpointer user_data) +gst_osssink_sink_fixate (GstPad *pad, const GstCaps *caps) { GstCaps *newcaps; GstStructure *structure; |