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

fixed bug #181:

Browse Source 
Change-Id: I5912036835046f7d6534114e83542ebcbcc019b7
This commit is contained in:
Hwasoo Lee 2010-09-21 11:40:21 -04:00
parent 1e9b0f5b21
commit c22b286ee0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mkvparser.cpp
View File

@ -1650,7 +1650,7 @@ Cluster* Segment::GetCluster(long long time_ns)
void Segment::GetCluster( void Segment::GetCluster(
__int64 time_ns, long long time_ns,
Track* pTrack, Track* pTrack,
Cluster*& pCluster, Cluster*& pCluster,
const BlockEntry*& pBlockEntry) const BlockEntry*& pBlockEntry)
@ -2088,7 +2088,7 @@ long Track::GetFirst(const BlockEntry*& pBlockEntry) const
const Block* const pBlock = pBlockEntry->GetBlock(); const Block* const pBlock = pBlockEntry->GetBlock();
assert(pBlock); assert(pBlock);
if (pBlock->GetTrackNumber() == m_info.number) if (pBlock->GetTrackNumber() == static_cast<unsigned long>(m_info.number))
return 0; return 0;
pBlockEntry = pCluster->GetNext(pBlockEntry); pBlockEntry = pCluster->GetNext(pBlockEntry);
@ -2113,7 +2113,7 @@ long Track::GetNext(
{ {
assert(pCurrEntry); assert(pCurrEntry);
assert(!pCurrEntry->EOS()); //? assert(!pCurrEntry->EOS()); //?
assert(pCurrEntry->GetBlock()->GetTrackNumber() == m_info.number); assert(pCurrEntry->GetBlock()->GetTrackNumber() == static_cast<unsigned long>(m_info.number));
#if 0 #if 0
const Cluster* const pCurrCluster = pCurrEntry->GetCluster(); const Cluster* const pCurrCluster = pCurrEntry->GetCluster();
@ -2228,7 +2228,7 @@ long Track::GetNext(
const Block* const pNextBlock = pNextEntry->GetBlock(); const Block* const pNextBlock = pNextEntry->GetBlock();
assert(pNextBlock); assert(pNextBlock);
if (pNextBlock->GetTrackNumber() == m_info.number) if (pNextBlock->GetTrackNumber() == static_cast<unsigned long>(m_info.number))
return 0; return 0;
pNextEntry = pCluster->GetNext(pNextEntry); pNextEntry = pCluster->GetNext(pNextEntry);

2
mkvparser.hpp
View File

@ -421,7 +421,7 @@ public:
Cluster* GetCluster(long long time_nanoseconds); Cluster* GetCluster(long long time_nanoseconds);
void GetCluster( void GetCluster(
__int64 time_nanoseconds, long long time_nanoseconds,
Track*, Track*,
Cluster*&, Cluster*&,
const BlockEntry*&); const BlockEntry*&);