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.

diff --git a/ChangeLog b/ChangeLog
index d9010bbf574758f39dece550d17e9f032c53c587..6a079db1dcbf3c59800d97239ae9798a7cf6c577 100644 (file)
--- 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 e258b347aa811ca7aa49e102ca3d576a91e4fb62..5ec931d243c53ddda5b2cbb9a2c21ce89747bcb4 160000 (submodule)
--- 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 6cf4b17ef798dff35f2e27416b5cc9f12fcf8eef..c268023e0065a31bd9d080a9646a100ab177780c 100644 (file)
--- 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);
+      }
     }
   }
 }