diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2006-08-28 17:47:29 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2006-08-28 17:47:29 +0000 |
| commit | 924cccc726a731bf7c896d21ecbb2e8c032506e0 (patch) | |
| tree | 49171c23c47b83c9ef8324050f89c71a503d9aed /gst | |
| parent | aafa72aff07813c4b0de0c1837e0876aa61bd46b (diff) | |
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.c | 2 |
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, |