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 | d83b0ef58d4f37a1eb99e7212e637778fa72c39e (patch) | |
| tree | 3c39e39eb177d28b8a4f07a3f452e64ecfa91112 | |
| parent | 23707c103211349dda6411edacbbed7880e650aa (diff) | |
| download | gst-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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2006-08-28 Wim Taymans <wim@fluendo.com> + + * 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. + 2006-08-28 Stefan Kost,,, <ensonic@users.sf.net> * sys/v4l2/v4l2_calls.c: (gst_v4l2_fill_lists): 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, |