diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | gst/videomixer/videomixer.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,5 +1,10 @@ 2008-01-16 Stefan Kost <ensonic@users.sf.net> + * gst/videomixer/videomixer.c: + Also commit the missing gst_object_sync_values(). + +2008-01-16 Stefan Kost <ensonic@users.sf.net> + * docs/plugins/Makefile.am: Remove duplicate entry. 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); |