diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 2 |
2 files changed, 9 insertions, 2 deletions
@@ -1,4 +1,11 @@ -2006-08-30 Stefan Kost,,, <ensonic@users.sf.net> +2006-08-30 Stefan Kost <ensonic@users.sf.net> + + * 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 <ensonic@users.sf.net> * gst/qtdemux/qtdemux.c: (gst_qtdemux_activate_segment), (qtdemux_parse_tree): 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, |