summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2006-08-28 17:47:29 +0000
committerWim Taymans <wim.taymans@gmail.com>2006-08-28 17:47:29 +0000
commitd83b0ef58d4f37a1eb99e7212e637778fa72c39e (patch)
tree3c39e39eb177d28b8a4f07a3f452e64ecfa91112 /gst
parent23707c103211349dda6411edacbbed7880e650aa (diff)
downloadgst-plugins-bad-d83b0ef58d4f37a1eb99e7212e637778fa72c39e.tar.gz
gst-plugins-bad-d83b0ef58d4f37a1eb99e7212e637778fa72c39e.tar.bz2
gst-plugins-bad-d83b0ef58d4f37a1eb99e7212e637778fa72c39e.zip
gst/qtdemux/qtdemux.c: Make sure segment start<=stop in weird quicktime files.
Original commit message from CVS: * gst/qtdemux/qtdemux.c: (gst_qtdemux_activate_segment), (gst_qtdemux_add_stream), (qtdemux_parse_trak), (qtdemux_video_caps): Make sure segment start<=stop in weird quicktime files.
Diffstat (limited to 'gst')
-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 55f35ade..bb83668c 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 = MIN (segment->media_start + seg_time, stop);
GST_DEBUG_OBJECT (qtdemux, "newsegment %d from %" GST_TIME_FORMAT
" to %" GST_TIME_FORMAT ", time %" GST_TIME_FORMAT, seg_idx,