summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2016-10-21 15:22:28 +0300
committerSebastian Dröge <sebastian@centricular.com>2016-10-21 15:23:14 +0300
commitcfdb97a135ab17b93fd0ff694763868794b14014 (patch)
treeb3c359c563beb2cc0d56445e17cb17aac8d61d4b
parentc0bfb1b524897afdb97e092241390ea4a25231f3 (diff)
Revert "queue: Fix race when calculating cur_level.time"
This reverts commit d03bd547809f849405a3f706920091d9b03147b0. It breaks the unit test, although it ensures that only correct values are used for calculations. Needs to be fixed up. https://bugzilla.gnome.org/show_bug.cgi?id=773096
-rw-r--r--plugins/elements/gstqueue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c
index 97aa0c09eb..e8f7f89767 100644
--- a/plugins/elements/gstqueue.c
+++ b/plugins/elements/gstqueue.c
@@ -546,7 +546,7 @@ update_time_level (GstQueue * queue)
GST_LOG_OBJECT (queue, "sink %" GST_STIME_FORMAT ", src %" GST_STIME_FORMAT,
GST_STIME_ARGS (sink_time), GST_STIME_ARGS (src_time));
- if (sink_time >= src_time && queue->newseg_applied_to_src)
+ if (sink_time >= src_time)
queue->cur_level.time = sink_time - src_time;
else
queue->cur_level.time = 0;