summaryrefslogtreecommitdiffstats
path: root/gst/qtdemux
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sourceforge.net>2006-08-30 11:07:37 +0000
committerStefan Kost <ensonic@users.sourceforge.net>2006-08-30 11:07:37 +0000
commit278c9c66393f9f3d565c0a9f2a60c129d404a0c6 (patch)
tree792570b05d2be14f08d631c61487ddaeb8f33314 /gst/qtdemux
parent669deaab5220fb50035e3ed735b96319ff76ea45 (diff)
downloadgst-plugins-bad-278c9c66393f9f3d565c0a9f2a60c129d404a0c6.tar.gz
gst-plugins-bad-278c9c66393f9f3d565c0a9f2a60c129d404a0c6.tar.bz2
gst-plugins-bad-278c9c66393f9f3d565c0a9f2a60c129d404a0c6.zip
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
Diffstat (limited to 'gst/qtdemux')
-rw-r--r--gst/qtdemux/qtdemux.c2
1 files changed, 1 insertions, 1 deletions
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,