From fd47c4fbf1c595f05360f2e210ec0372c4609cb8 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Wed, 6 Dec 2006 15:06:04 +0000 Subject: gst/videomixer/videomixer.c: Don't reset xpos and ypos in the setcaps function because causes unexpected behaviour. Original commit message from CVS: Patch by: Sjoerd Simons * 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. --- gst/videomixer/videomixer.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gst/videomixer') diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c index 3fd04244..a84225b3 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; -- cgit