summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2009-11-09 11:49:15 +0100
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2009-11-09 11:49:47 +0100
commitd64c99e138db4b1efefdaecc5140fd0c8e466826 (patch)
treec089ab0db3f1532763cd385f401a764b03c55d09
parent9a627f1106814e6b1e50e89cb2a7119a0175869d (diff)
inputselector: Remove useless variables and fix a uninitialized variable compiler warnings
Merged from gst-plugins-base, dfd51aa82a9e1c9924375183796eab70e574a231.
-rw-r--r--gst/selector/gstinputselector.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/gst/selector/gstinputselector.c b/gst/selector/gstinputselector.c
index 9cd3a7985e..e5dc12b707 100644
--- a/gst/selector/gstinputselector.c
+++ b/gst/selector/gstinputselector.c
@@ -557,7 +557,7 @@ gst_selector_pad_chain (GstPad * pad, GstBuffer * buf)
GstPad *active_sinkpad;
GstPad *prev_active_sinkpad;
GstSelectorPad *selpad;
- GstClockTime start_time, end_time, duration;
+ GstClockTime start_time;
GstSegment *seg;
GstEvent *close_event = NULL, *start_event = NULL;
GstCaps *caps;
@@ -581,11 +581,9 @@ gst_selector_pad_chain (GstPad * pad, GstBuffer * buf)
if (GST_CLOCK_TIME_IS_VALID (start_time)) {
GST_DEBUG_OBJECT (pad, "received start time %" GST_TIME_FORMAT,
GST_TIME_ARGS (start_time));
- duration = GST_BUFFER_DURATION (buf);
- if (GST_CLOCK_TIME_IS_VALID (duration))
- end_time += duration;
- GST_DEBUG_OBJECT (pad, "received end time %" GST_TIME_FORMAT,
- GST_TIME_ARGS (end_time));
+ if (GST_BUFFER_DURATION_IS_VALID (buf))
+ GST_DEBUG_OBJECT (pad, "received end time %" GST_TIME_FORMAT,
+ GST_TIME_ARGS (start_time + GST_BUFFER_DURATION (buf)));
GST_OBJECT_LOCK (pad);
gst_segment_set_last_stop (seg, seg->format, start_time);