From c22b286ee0b3d2406ccd642e55f2161790e8e8ef Mon Sep 17 00:00:00 2001
From: Hwasoo Lee <hwasoolee@google.com>
Date: Tue, 21 Sep 2010 11:40:21 -0400
Subject: [PATCH] fixed bug #181:

Change-Id: I5912036835046f7d6534114e83542ebcbcc019b7
---
 mkvparser.cpp | 8 ++++----
 mkvparser.hpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mkvparser.cpp b/mkvparser.cpp
index 858fccf..725ec5b 100644
--- a/mkvparser.cpp
+++ b/mkvparser.cpp
@@ -1650,7 +1650,7 @@ Cluster* Segment::GetCluster(long long time_ns)
 
 
 void Segment::GetCluster(
-    __int64 time_ns,
+    long long time_ns,
     Track* pTrack,
     Cluster*& pCluster,
     const BlockEntry*& pBlockEntry)
@@ -2088,7 +2088,7 @@ long Track::GetFirst(const BlockEntry*& pBlockEntry) const
             const Block* const pBlock = pBlockEntry->GetBlock();
             assert(pBlock);
 
-            if (pBlock->GetTrackNumber() == m_info.number)
+            if (pBlock->GetTrackNumber() == static_cast<unsigned long>(m_info.number))
                 return 0;
 
             pBlockEntry = pCluster->GetNext(pBlockEntry);
@@ -2113,7 +2113,7 @@ long Track::GetNext(
 {
     assert(pCurrEntry);
     assert(!pCurrEntry->EOS());  //?
-    assert(pCurrEntry->GetBlock()->GetTrackNumber() == m_info.number);
+    assert(pCurrEntry->GetBlock()->GetTrackNumber() == static_cast<unsigned long>(m_info.number));
 
 #if 0
     const Cluster* const pCurrCluster = pCurrEntry->GetCluster();
@@ -2228,7 +2228,7 @@ long Track::GetNext(
             const Block* const pNextBlock = pNextEntry->GetBlock();
             assert(pNextBlock);
 
-            if (pNextBlock->GetTrackNumber() == m_info.number)
+            if (pNextBlock->GetTrackNumber() == static_cast<unsigned long>(m_info.number))
                 return 0;
 
             pNextEntry = pCluster->GetNext(pNextEntry);
diff --git a/mkvparser.hpp b/mkvparser.hpp
index 30e7f08..9f6ed44 100644
--- a/mkvparser.hpp
+++ b/mkvparser.hpp
@@ -421,7 +421,7 @@ public:
     Cluster* GetCluster(long long time_nanoseconds);
 
     void GetCluster(
-        __int64 time_nanoseconds,
+        long long time_nanoseconds,
         Track*,
         Cluster*&,
         const BlockEntry*&);