From 658b2d7f8515a4214b65ce30f6285c853b2e9137 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 7 Sep 2004 13:40:52 +0000 Subject: gst/videomixer/videomixer.c: Copy timestamps from the master pad to the output buffers. Original commit message from CVS: * gst/videomixer/videomixer.c: (gst_videomixer_blend_buffers): Copy timestamps from the master pad to the output buffers. --- ChangeLog | 5 +++++ common | 2 +- gst/videomixer/videomixer.c | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d9010bbf..6a079db1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-09-07 Wim Taymans + + * gst/videomixer/videomixer.c: (gst_videomixer_blend_buffers): + Copy timestamps from the master pad to the output buffers. + 2004-09-03 Thomas Vander Stichele * ext/raw1394/gstdv1394src.c: diff --git a/common b/common index e258b347..5ec931d2 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit e258b347aa811ca7aa49e102ca3d576a91e4fb62 +Subproject commit 5ec931d243c53ddda5b2cbb9a2c21ce89747bcb4 diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c index 6cf4b17e..c268023e 100644 --- a/gst/videomixer/videomixer.c +++ b/gst/videomixer/videomixer.c @@ -991,6 +991,10 @@ gst_videomixer_blend_buffers (GstVideoMixer * mix, GstBuffer * outbuf) 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 (pad->buffer); + GST_BUFFER_DURATION (outbuf) = GST_BUFFER_DURATION (pad->buffer); + } } } } -- cgit