diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | gst/videomixer/videomixer.c | 6 |
2 files changed, 12 insertions, 5 deletions
@@ -1,5 +1,16 @@ 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), (gst_multipart_mux_queue_pads), (gst_multipart_mux_collected): Keep track of the buffer timestamp in the collectdata member instead 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; |