From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Mon, 18 Feb 2008 08:59:43 +0000 (+0000)
Subject: MKV: use __MIN instead of min(
X-Git-Tag: 0.9.0-test0~2626
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8c55b82642441491f14486744abf6a145cd7d7db;p=vlc

MKV: use __MIN instead of min(
---

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index 65ed0fb85b..344fdb4792 100644
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -6035,7 +6035,7 @@ bool dvd_chapter_codec_c::Enter()
             binary *p_data = (*index)->GetBuffer();
             size_t i_size = *p_data++;
             // avoid reading too much from the buffer
-            i_size = min( i_size, ((*index)->GetSize() - 1) >> 3 );
+            i_size = __MIN( i_size, ((*index)->GetSize() - 1) >> 3 );
             for ( ; i_size > 0; i_size--, p_data += 8 )
             {
                 msg_Dbg( &sys.demuxer, "Matroska DVD enter command" );
@@ -6058,7 +6058,7 @@ bool dvd_chapter_codec_c::Leave()
             binary *p_data = (*index)->GetBuffer();
             size_t i_size = *p_data++;
             // avoid reading too much from the buffer
-            i_size = min( i_size, ((*index)->GetSize() - 1) >> 3 );
+            i_size = __MIN( i_size, ((*index)->GetSize() - 1) >> 3 );
             for ( ; i_size > 0; i_size--, p_data += 8 )
             {
                 msg_Dbg( &sys.demuxer, "Matroska DVD leave command" );