mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-31 03:29:50 +00:00
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
This commit is contained in:
parent
669deaab52
commit
278c9c6639
2 changed files with 9 additions and 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):
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue