From dbf28d28e755089fdb13790ca930f1511c17adc0 Mon Sep 17 00:00:00 2001
From: Wouter Cloetens <wouter@mind.be>
Date: Tue, 11 Dec 2007 11:05:57 +0000
Subject: [PATCH] gst/multipart/multipartdemux.c: Copy timestamp from input to
 output. Not very perfect yet but better than nothing. Fi...

Original commit message from CVS:
Patch by: Wouter Cloetens <wouter at mind dot be>
* gst/multipart/multipartdemux.c: (gst_multipart_demux_chain):
Copy timestamp from input to output. Not very perfect yet but better
than nothing. Fixes #503023.
---
 ChangeLog                      | 8 ++++++++
 gst/multipart/multipartdemux.c | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0c11625fe7..ce62be0fe1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-11  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	Patch by: Wouter Cloetens <wouter at mind dot be>
+
+	* gst/multipart/multipartdemux.c: (gst_multipart_demux_chain):
+	Copy timestamp from input to output. Not very perfect yet but better
+	than nothing. Fixes #503023.
+
 2007-12-09  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_chain):
diff --git a/gst/multipart/multipartdemux.c b/gst/multipart/multipartdemux.c
index c5f9f39046..67cb737207 100644
--- a/gst/multipart/multipartdemux.c
+++ b/gst/multipart/multipartdemux.c
@@ -527,8 +527,11 @@ gst_multipart_demux_chain (GstPad * pad, GstBuffer * buf)
       gst_pad_push_event (srcpad->pad, event);
       GST_BUFFER_TIMESTAMP (outbuf) = 0;
     } else {
-      GST_BUFFER_TIMESTAMP (outbuf) = -1;
+      GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buf);
     }
+    GST_DEBUG_OBJECT (multipart,
+        "pushing buffer with timestamp %" GST_TIME_FORMAT,
+        GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)));
     res = gst_pad_push (srcpad->pad, outbuf);
     if (res != GST_FLOW_OK)
       break;