diff --git a/ChangeLog b/ChangeLog
index e3c5544536..b7fd78fe4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-12-06  Wim Taymans  <wim@fluendo.com>
+
+	Patch by: Sjoerd Simons <sjoerd at luon dot net>
+
+	* gst/videomixer/videomixer.c:
+	(gst_videomixer_set_master_geometry),
+	(gst_videomixer_pad_sink_setcaps), (gst_videomixer_collect_free):
+	Don't reset xpos and ypos in the setcaps function because causes
+	unexpected behaviour.
+	Fixes #382179.
+
 2006-12-06  Wim Taymans  <wim@fluendo.com>
 
 	* gst/multipart/multipartmux.c: (gst_multipart_mux_compare_pads),
diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c
index 3fd0424426..a84225b3a1 100644
--- a/gst/videomixer/videomixer.c
+++ b/gst/videomixer/videomixer.c
@@ -364,9 +364,8 @@ gst_videomixer_pad_sink_setcaps (GstPad * pad, GstCaps * vscaps)
   mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
   mixpad = GST_VIDEO_MIXER_PAD (pad);
 
-  if (!mixpad) {
+  if (!mixpad)
     goto beach;
-  }
 
   GST_DEBUG_OBJECT (mixpad, "setcaps triggered");
 
@@ -383,9 +382,6 @@ gst_videomixer_pad_sink_setcaps (GstPad * pad, GstCaps * vscaps)
   mixpad->in_width = in_width;
   mixpad->in_height = in_height;
 
-  mixpad->xpos = 0;
-  mixpad->ypos = 0;
-
   gst_videomixer_set_master_geometry (mix);
 
   ret = TRUE;