From 1747db592712a3ead18a8e89a92c57ec2493888a Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@gmail.com>
Date: Tue, 7 Sep 2004 13:40:52 +0000
Subject: [PATCH] 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 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d9010bb..6a079db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-07  Wim Taymans  <wim@fluendo.com>
+
+	* gst/videomixer/videomixer.c: (gst_videomixer_blend_buffers):
+	Copy timestamps from the master pad to the output buffers.
+
 2004-09-03  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* ext/raw1394/gstdv1394src.c:
diff --git a/common b/common
index e258b34..5ec931d 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit e258b347aa811ca7aa49e102ca3d576a91e4fb62
+Subproject commit 5ec931d243c53ddda5b2cbb9a2c21ce89747bcb4
-- 
2.7.4