diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2006-12-06 15:06:04 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2006-12-06 15:06:04 +0000 |
| commit | fd47c4fbf1c595f05360f2e210ec0372c4609cb8 (patch) | |
| tree | cbc61ece1b477abf28b7989f2ae4ea2956810b86 /gst/videomixer | |
| parent | 1444040b98a22a652c7e02c902b7964fdcd21cff (diff) | |
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 <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.
Diffstat (limited to 'gst/videomixer')
| -rw-r--r-- | gst/videomixer/videomixer.c | 6 |
1 files changed, 1 insertions, 5 deletions
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; |