From a55257b6d89735cad00e6aa1a86c4793c71ae0fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 17 Feb 2006 18:25:42 +0000 Subject: gst/qtdemux/qtdemux.c: Don't GST_LOG timestamps from nonexistent index entries (#331582). Original commit message from CVS: * gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_state_movie): Don't GST_LOG timestamps from nonexistent index entries (#331582). --- ChangeLog | 6 ++++++ gst/qtdemux/qtdemux.c | 18 ++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c5ce4af..9e018e74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-02-17 Tim-Philipp Müller + + * gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_state_movie): + Don't GST_LOG timestamps from nonexistent index + entries (#331582). + 2006-02-17 Edward Hervey * gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_state_header): diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index fca86a34..df9f57b7 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -642,14 +642,16 @@ gst_qtdemux_loop_state_movie (GstQTDemux * qtdemux) min_time = G_MAXUINT64; for (i = 0; i < qtdemux->n_streams; i++) { stream = qtdemux->streams[i]; - GST_LOG_OBJECT (qtdemux, - "stream %d: sample_index %d, timestamp %" GST_TIME_FORMAT, i, - stream->sample_index, - GST_TIME_ARGS (stream->samples[stream->sample_index].timestamp)); - if (stream->sample_index < stream->n_samples - && stream->samples[stream->sample_index].timestamp < min_time) { - min_time = stream->samples[stream->sample_index].timestamp; - index = i; + if (stream->sample_index < stream->n_samples) { + GST_LOG_OBJECT (qtdemux, + "stream %d: sample_index %d, timestamp %" GST_TIME_FORMAT, i, + stream->sample_index, + GST_TIME_ARGS (stream->samples[stream->sample_index].timestamp)); + + if (stream->samples[stream->sample_index].timestamp < min_time) { + min_time = stream->samples[stream->sample_index].timestamp; + index = i; + } } } if (index == -1) { -- cgit v1.2.1