summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2006-02-17 18:25:42 +0000
committerTim-Philipp Müller <tim@centricular.net>2006-02-17 18:25:42 +0000
commita55257b6d89735cad00e6aa1a86c4793c71ae0fe (patch)
tree1678399eac714ac4a1084e64fb39c347663aedca
parent19ccb5f6ec23d0cf76afdf3eefc1d93462c7e86c (diff)
downloadgst-plugins-bad-a55257b6d89735cad00e6aa1a86c4793c71ae0fe.tar.gz
gst-plugins-bad-a55257b6d89735cad00e6aa1a86c4793c71ae0fe.tar.bz2
gst-plugins-bad-a55257b6d89735cad00e6aa1a86c4793c71ae0fe.zip
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).
-rw-r--r--ChangeLog6
-rw-r--r--gst/qtdemux/qtdemux.c18
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 <tim at centricular dot net>
+
+ * gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_state_movie):
+ Don't GST_LOG timestamps from nonexistent index
+ entries (#331582).
+
2006-02-17 Edward Hervey <edward@fluendo.com>
* 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) {