[vlc-devel] commit: MKV: use __MIN instead of min( (Jean-Baptiste Kempf )

[git version control]

vlc | branch: 0.8.6-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Mon Feb 18 08:59:43 2008 +0000| [7adbc4ef71a1157f9b00dc369502e015cbbbc1dd]

MKV: use __MIN instead of min(

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7adbc4ef71a1157f9b00dc369502e015cbbbc1dd
---

 modules/demux/mkv.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index 6590e70..90b8432 100644
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -5845,7 +5845,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" );
@@ -5868,7 +5868,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" );