gst/qtdemux/qtdemux.c: Make sure segment start<=stop in weird quicktime files.
authorWim Taymans <wim.taymans@gmail.com>
Mon, 28 Aug 2006 17:47:29 +0000 (17:47 +0000)
committerWim Taymans <wim.taymans@gmail.com>
Mon, 28 Aug 2006 17:47:29 +0000 (17:47 +0000)
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.

gst/qtdemux/qtdemux.c

index 55f35ad..bb83668 100644 (file)
@@ -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,