From 278c9c66393f9f3d565c0a9f2a60c129d404a0c6 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Wed, 30 Aug 2006 11:07:37 +0000 Subject: gst/qtdemux/qtdemux.c: put back 'segment start<=stop' change that was mystically reverted by the last commit Original commit message from CVS: * gst/qtdemux/qtdemux.c: (gst_qtdemux_activate_segment), (qtdemux_parse_tree): put back 'segment start<=stop' change that was mystically reverted by the last commit --- gst/qtdemux/qtdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gst/qtdemux') diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 7e35c91d..de5f842c 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -1084,11 +1084,11 @@ gst_qtdemux_activate_segment (GstQTDemux * qtdemux, QtDemuxStream * stream, return FALSE; /* calc media start/stop */ - start = segment->media_start + seg_time; if (qtdemux->segment.stop == -1) stop = segment->media_stop; else stop = MIN (segment->media_stop, qtdemux->segment.stop); + start = segment->media_start + seg_time; GST_DEBUG_OBJECT (qtdemux, "newsegment %d from %" GST_TIME_FORMAT " to %" GST_TIME_FORMAT ", time %" GST_TIME_FORMAT, seg_idx, -- cgit v1.2.1