inputselector: Make sure that running_time->timestamp calculation never becomes negative
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 9 Nov 2009 10:48:39 +0000 (11:48 +0100)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 31 Dec 2010 00:54:04 +0000 (00:54 +0000)
Merged from gst-plugins-base, f3653854585864a09d35e037853407332ea6901f.

plugins/elements/gstinputselector.c

index 0929cdf..9cd3a79 100644 (file)
@@ -907,7 +907,10 @@ gst_input_selector_dispose (GObject * object)
 static gint64
 gst_segment_get_timestamp (GstSegment * segment, gint64 running_time)
 {
-  return (running_time - segment->accum) * segment->abs_rate + segment->start;
+  if (running_time <= segment->accum)
+    return segment->start;
+  else
+    return (running_time - segment->accum) * segment->abs_rate + segment->start;
 }
 
 static void