summaryrefslogtreecommitdiffstats
path: root/gst/videomixer
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sourceforge.net>2008-01-16 20:17:08 +0000
committerStefan Kost <ensonic@users.sourceforge.net>2008-01-16 20:17:08 +0000
commit8b570d9fd09a7e6319e0304cff42244071174aa9 (patch)
tree91dc9f14a5a945460fbdd3bd24a78d037ffee214 /gst/videomixer
parent25a29e6d16bd9d40003d99b19d142164bc8b6d7a (diff)
gst/videomixer/videomixer.c: Also commit the missing gst_object_sync_values().
Original commit message from CVS: * gst/videomixer/videomixer.c: Also commit the missing gst_object_sync_values().
Diffstat (limited to 'gst/videomixer')
-rw-r--r--gst/videomixer/videomixer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c
index 74e0d0b0..2d3baa77 100644
--- a/gst/videomixer/videomixer.c
+++ b/gst/videomixer/videomixer.c
@@ -1031,10 +1031,10 @@ gst_videomixer_blend_buffers (GstVideoMixer * mix, GstBuffer * outbuf)
walk = g_slist_next (walk);
if (mixcol->buffer != NULL) {
+ gst_object_sync_values (G_OBJECT (pad),
+ GST_BUFFER_TIMESTAMP (mixcol->buffer));
gst_videomixer_blend_ayuv_ayuv (GST_BUFFER_DATA (mixcol->buffer),
- pad->xpos, pad->ypos,
- pad->in_width, pad->in_height,
- pad->alpha,
+ pad->xpos, pad->ypos, pad->in_width, pad->in_height, pad->alpha,
GST_BUFFER_DATA (outbuf), mix->out_width, mix->out_height);
if (pad == mix->master) {
GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (mixcol->buffer);