summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Santos <thiago.sousa.santos@collabora.co.uk>2010-02-17 16:27:33 -0300
committerThiago Santos <thiago.sousa.santos@collabora.co.uk>2010-02-18 07:53:34 -0300
commitf1c61e1d84ee83336bfb59aa9ec8a49afbd92539 (patch)
tree8ed111f8dee701c2c3b051aa55cca11b39e3bbd9
parent2723de585eb82f9bcf9230ab9c71958426bc45f8 (diff)
qtdemux: Use the correct duration when comparing segments
Do not confuse QtDemuxSegments with GstSegments when comparing the total file duration with the segment duration Fixes #610296
-rw-r--r--gst/qtdemux/qtdemux.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 487093729..92a0fd083 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -2097,9 +2097,10 @@ gst_qtdemux_activate_segment (GstQTDemux * qtdemux, QtDemuxStream * stream,
}
/* segment lies beyond total indicated duration */
- if (G_UNLIKELY (segment->duration != -1 && segment->time > segment->duration)) {
- GST_WARNING_OBJECT (qtdemux, "segment->duration %" G_GUINT64_FORMAT
- " < segment->time %" G_GUINT64_FORMAT, segment->duration,
+ if (G_UNLIKELY (qtdemux->segment.duration != -1 &&
+ segment->time > qtdemux->segment.duration)) {
+ GST_WARNING_OBJECT (qtdemux, "file duration %" G_GINT64_FORMAT
+ " < segment->time %" G_GUINT64_FORMAT, qtdemux->segment.duration,
segment->time);
return FALSE;
}