From 32e1556e68d44c64021d9425bccedd96c2c28e6e Mon Sep 17 00:00:00 2001 From: Tom Finegan Date: Wed, 15 Jan 2014 12:14:27 -0800 Subject: [PATCH] mkvmuxer: Fix warnings. Remove useless spam from build output. Change-Id: Iae200d32cda1fc11cd471772725345d0979e97bc --- mkvmuxer.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mkvmuxer.cpp b/mkvmuxer.cpp index d9f71a8..d6c1e85 100644 --- a/mkvmuxer.cpp +++ b/mkvmuxer.cpp @@ -8,6 +8,7 @@ #include "mkvmuxer.hpp" +#include #include #include #include @@ -100,9 +101,9 @@ bool ChunkedCopy(mkvparser::IMkvReader* source, int64 offset = start; while (size > 0) { const int64 read_len = (size > kBufSize) ? kBufSize : size; - if (source->Read(offset, read_len, buf)) + if (source->Read(offset, static_cast(read_len), buf)) return false; - dst->Write(buf, read_len); + dst->Write(buf, static_cast(read_len)); offset += read_len; size -= read_len; } @@ -1797,13 +1798,13 @@ bool SeekHead::AddSeekEntry(uint32 id, uint64 pos) { uint32 SeekHead::GetId(int index) const { if (index < 0 || index >= kSeekEntryCount) - return -1; + return UINT_MAX; return seek_entry_id_[index]; } uint64 SeekHead::GetPosition(int index) const { if (index < 0 || index >= kSeekEntryCount) - return -1; + return ULLONG_MAX; return seek_entry_pos_[index]; } @@ -2106,8 +2107,8 @@ void Segment::MoveCuesBeforeClusters() { // Adjust the Seek Entry to reflect the change in position // of Cluster and Cues - int32 cluster_index; - int32 cues_index; + int32 cluster_index = 0; + int32 cues_index = 0; for (int32 i = 0; i < SeekHead::kSeekEntryCount; ++i) { if (seek_head_.GetId(i) == kMkvCluster) cluster_index = i;