[gst-cvs] gstreamer: basesink: take timestamp later

[Wim Taymans]

Module: gstreamer
Branch: master
Commit: 27fe127e76dce6e066c98199ee6f9e37176c248e
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=27fe127e76dce6e066c98199ee6f9e37176c248e

Author: Ognyan Tonchev <ognyan at axis.com>
Date:   Mon Jun 29 11:46:00 2009 +0200

basesink: take timestamp later

Make sure we don't accidentally cast a bufferlist of a buffer and try to take
the timestamp of it.

Refixes #585960

---

 libs/gst/base/gstbasesink.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c
index 65fbf31..a728074 100644
--- a/libs/gst/base/gstbasesink.c
+++ b/libs/gst/base/gstbasesink.c
@@ -2849,9 +2849,6 @@ gst_base_sink_preroll_object (GstBaseSink * basesink, gboolean is_list,
     GstBuffer *buf;
     GstClockTime timestamp;
 
-    buf = GST_BUFFER_CAST (obj);
-    timestamp = GST_BUFFER_TIMESTAMP (buf);
-
     if (is_list) {
       GstBufferListIterator *it;
       gboolean got_group;
@@ -2866,6 +2863,8 @@ gst_base_sink_preroll_object (GstBaseSink * basesink, gboolean is_list,
       buf = GST_BUFFER_CAST (obj);
     }
 
+    timestamp = GST_BUFFER_TIMESTAMP (buf);
+
     GST_DEBUG_OBJECT (basesink, "preroll buffer %" GST_TIME_FORMAT,
         GST_TIME_ARGS (timestamp));