From 278c9c66393f9f3d565c0a9f2a60c129d404a0c6 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Wed, 30 Aug 2006 11:07:37 +0000 Subject: [PATCH] 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 --- ChangeLog | 9 ++++++++- gst/qtdemux/qtdemux.c | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c68fcbe7fb..3a848fb5a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,11 @@ -2006-08-30 Stefan Kost,,, +2006-08-30 Stefan Kost + + * 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 + +2006-08-30 Stefan Kost * gst/qtdemux/qtdemux.c: (gst_qtdemux_activate_segment), (qtdemux_parse_tree): diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 7e35c91df3..de5f842cad 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,