From d59c0aad95b4a2d120bfa937cfb050b95471306f Mon Sep 17 00:00:00 2001 From: Jean-Yves Avenard Date: Mon, 25 May 2015 15:09:16 +1000 Subject: [PATCH] Bug 1163227: Part4. Fix MP4TrackDemuxer eviction offset calculations. r=mattwoodrow --- dom/media/fmp4/MP4Demuxer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dom/media/fmp4/MP4Demuxer.cpp b/dom/media/fmp4/MP4Demuxer.cpp index ce0c10160947..001c5ba48094 100644 --- a/dom/media/fmp4/MP4Demuxer.cpp +++ b/dom/media/fmp4/MP4Demuxer.cpp @@ -298,7 +298,8 @@ int64_t MP4TrackDemuxer::GetEvictionOffset(media::TimeUnit aTime) { MonitorAutoLock mon(mMonitor); - return int64_t(mIndex->GetEvictionOffset(aTime.ToMicroseconds())); + uint64_t offset = mIndex->GetEvictionOffset(aTime.ToMicroseconds()); + return int64_t(offset == std::numeric_limits::max() ? 0 : offset); } media::TimeIntervals