Skip to content

V
vlc-1.1
Commit 8c55b826 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

MKV: use __MIN instead of min(

parent 2d261c07
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/demux/mkv.cpp
View file @ 8c55b826
...@@ -6035,7 +6035,7 @@ bool dvd_chapter_codec_c::Enter() ...@@ -6035,7 +6035,7 @@ bool dvd_chapter_codec_c::Enter()
binary *p_data = (*index)->GetBuffer(); binary *p_data = (*index)->GetBuffer();
size_t i_size = *p_data++; size_t i_size = *p_data++;
// avoid reading too much from the buffer // 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 ) for ( ; i_size > 0; i_size--, p_data += 8 )
{ {
msg_Dbg( &sys.demuxer, "Matroska DVD enter command" ); msg_Dbg( &sys.demuxer, "Matroska DVD enter command" );
...@@ -6058,7 +6058,7 @@ bool dvd_chapter_codec_c::Leave() ...@@ -6058,7 +6058,7 @@ bool dvd_chapter_codec_c::Leave()
binary *p_data = (*index)->GetBuffer(); binary *p_data = (*index)->GetBuffer();
size_t i_size = *p_data++; size_t i_size = *p_data++;
// avoid reading too much from the buffer // 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 ) for ( ; i_size > 0; i_size--, p_data += 8 )
{ {
msg_Dbg( &sys.demuxer, "Matroska DVD leave command" ); msg_Dbg( &sys.demuxer, "Matroska DVD leave command" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment