summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--gst/videomixer/videomixer.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cbf50ced..594b7fb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-09 Edward Hervey <edward.hervey@collabora.co.uk>
+
+ * gst/videomixer/videomixer.c: (gst_videomixer_init):
+ Fix error from my last commit.
+
2008-01-09 Tim-Philipp Müller <tim at centricular dot net>
Based on patch by: Tommi Myöhänen <ext-tommi.myohanen nokia com>
diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c
index f0acb41d..7ec99b47 100644
--- a/gst/videomixer/videomixer.c
+++ b/gst/videomixer/videomixer.c
@@ -647,7 +647,7 @@ gst_videomixer_reset (GstVideoMixer * mix)
}
static void
-gst_videomixer_init (GstVideoMixer * mix)
+gst_videomixer_init (GstVideoMixer * mix, GstVideoMixerClass * g_class)
{
GstElementClass *klass = GST_ELEMENT_GET_CLASS (mix);