generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mkvmuxer: Fix warnings.

Browse Source 
Remove useless spam from build output.

Change-Id: Iae200d32cda1fc11cd471772725345d0979e97bc
This commit is contained in:
Tom Finegan 2014-01-15 12:14:27 -08:00
parent 5efd6e3c1d
commit 32e1556e68
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mkvmuxer.cpp
View File

@ -8,6 +8,7 @@
#include "mkvmuxer.hpp" #include "mkvmuxer.hpp"
#include <climits>
#include <cstdio> #include <cstdio>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
@ -100,9 +101,9 @@ bool ChunkedCopy(mkvparser::IMkvReader* source,
int64 offset = start; int64 offset = start;
while (size > 0) { while (size > 0) {
const int64 read_len = (size > kBufSize) ? kBufSize : size; const int64 read_len = (size > kBufSize) ? kBufSize : size;
if (source->Read(offset, read_len, buf)) if (source->Read(offset, static_cast<long>(read_len), buf))
return false; return false;
dst->Write(buf, read_len); dst->Write(buf, static_cast<uint32>(read_len));
offset += read_len; offset += read_len;
size -= read_len; size -= read_len;
} }
@ -1797,13 +1798,13 @@ bool SeekHead::AddSeekEntry(uint32 id, uint64 pos) {
uint32 SeekHead::GetId(int index) const { uint32 SeekHead::GetId(int index) const {
if (index < 0 || index >= kSeekEntryCount) if (index < 0 || index >= kSeekEntryCount)
return -1; return UINT_MAX;
return seek_entry_id_[index]; return seek_entry_id_[index];
} }
uint64 SeekHead::GetPosition(int index) const { uint64 SeekHead::GetPosition(int index) const {
if (index < 0 || index >= kSeekEntryCount) if (index < 0 || index >= kSeekEntryCount)
return -1; return ULLONG_MAX;
return seek_entry_pos_[index]; return seek_entry_pos_[index];
} }
@ -2106,8 +2107,8 @@ void Segment::MoveCuesBeforeClusters() {
// Adjust the Seek Entry to reflect the change in position // Adjust the Seek Entry to reflect the change in position
// of Cluster and Cues // of Cluster and Cues
int32 cluster_index; int32 cluster_index = 0;
int32 cues_index; int32 cues_index = 0;
for (int32 i = 0; i < SeekHead::kSeekEntryCount; ++i) { for (int32 i = 0; i < SeekHead::kSeekEntryCount; ++i) {
if (seek_head_.GetId(i) == kMkvCluster) if (seek_head_.GetId(i) == kMkvCluster)
cluster_index = i; cluster_index = i;