mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-19 14:56:36 +00:00
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.
This commit is contained in:
parent
23707c1032
commit
d83b0ef58d
2 changed files with 8 additions and 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):
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue