mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-07 19:22:15 +00:00
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.
This commit is contained in:
parent
1444040b98
commit
fd47c4fbf1
2 changed files with 12 additions and 5 deletions
11
ChangeLog
11
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>
|
2006-12-06 Wim Taymans <wim@fluendo.com>
|
||||||
|
|
||||||
* gst/multipart/multipartmux.c: (gst_multipart_mux_compare_pads),
|
* gst/multipart/multipartmux.c: (gst_multipart_mux_compare_pads),
|
||||||
|
|
|
@ -364,9 +364,8 @@ gst_videomixer_pad_sink_setcaps (GstPad * pad, GstCaps * vscaps)
|
||||||
mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
|
mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
|
||||||
mixpad = GST_VIDEO_MIXER_PAD (pad);
|
mixpad = GST_VIDEO_MIXER_PAD (pad);
|
||||||
|
|
||||||
if (!mixpad) {
|
if (!mixpad)
|
||||||
goto beach;
|
goto beach;
|
||||||
}
|
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (mixpad, "setcaps triggered");
|
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_width = in_width;
|
||||||
mixpad->in_height = in_height;
|
mixpad->in_height = in_height;
|
||||||
|
|
||||||
mixpad->xpos = 0;
|
|
||||||
mixpad->ypos = 0;
|
|
||||||
|
|
||||||
gst_videomixer_set_master_geometry (mix);
|
gst_videomixer_set_master_geometry (mix);
|
||||||
|
|
||||||
ret = TRUE;
|
ret = TRUE;
|
||||||
|
|
Loading…
Reference in a new issue