From 658b2d7f8515a4214b65ce30f6285c853b2e9137 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@gmail.com>
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.
---
 gst/videomixer/videomixer.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'gst')

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