mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 16:50:47 +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
6e1ee76fa3
commit
9e00a40ce9
1 changed files with 1 additions and 1 deletions
|
@ -1084,11 +1084,11 @@ gst_qtdemux_activate_segment (GstQTDemux * qtdemux, QtDemuxStream * stream,
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
/* calc media start/stop */
|
/* calc media start/stop */
|
||||||
start = segment->media_start + seg_time;
|
|
||||||
if (qtdemux->segment.stop == -1)
|
if (qtdemux->segment.stop == -1)
|
||||||
stop = segment->media_stop;
|
stop = segment->media_stop;
|
||||||
else
|
else
|
||||||
stop = MIN (segment->media_stop, qtdemux->segment.stop);
|
stop = MIN (segment->media_stop, qtdemux->segment.stop);
|
||||||
|
start = segment->media_start + seg_time;
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (qtdemux, "newsegment %d from %" GST_TIME_FORMAT
|
GST_DEBUG_OBJECT (qtdemux, "newsegment %d from %" GST_TIME_FORMAT
|
||||||
" to %" GST_TIME_FORMAT ", time %" GST_TIME_FORMAT, seg_idx,
|
" to %" GST_TIME_FORMAT ", time %" GST_TIME_FORMAT, seg_idx,
|
||||||
|
|
Loading…
Reference in a new issue