summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.com>2013-03-30 11:00:35 +0000
committerWim Taymans <wim.taymans@collabora.co.uk>2013-04-04 10:09:26 +0200
commite58f838ca3a69c5eb2efcb01dc033097e31b5d83 (patch)
treed7e6f00c2126b4e2955b2a11e508fe2a228876b9
parent0940dae79399767742dbc591ed2c43609209a15d (diff)
oggdemux: Allow EOS on timestamp equal to stop/start
Changed the check to a current_time equal to the stop will produce EOS instead of the next one. Also, segment.start can't be NONE, so removing this check. Fixes https://bugzilla.gnome.org/show_bug.cgi?id=696899
-rw-r--r--ext/ogg/gstoggdemux.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index 7c0bf6e51..191ae264e 100644
--- a/ext/ogg/gstoggdemux.c
+++ b/ext/ogg/gstoggdemux.c
@@ -707,9 +707,8 @@ gst_ogg_demux_chain_peer (GstOggPad * pad, ogg_packet * packet,
/* check stream eos */
if ((ogg->segment.rate > 0.0 && ogg->segment.stop != GST_CLOCK_TIME_NONE &&
- current_time > ogg->segment.stop) ||
- (ogg->segment.rate < 0.0 && ogg->segment.start != GST_CLOCK_TIME_NONE &&
- current_time < ogg->segment.start)) {
+ current_time >= ogg->segment.stop) ||
+ (ogg->segment.rate < 0.0 && current_time <= ogg->segment.start)) {
GST_DEBUG_OBJECT (ogg, "marking pad %p EOS", pad);
pad->is_eos = TRUE;
}