Commit 764aab71 authored by Gildas Bazin's avatar Gildas Bazin

* src/input/stream.c, modules/demux/avi/avi.c: work around evc++ compiler bug.

* evc/libvlc.vcp.in: small fix.
parent 79390c26
...@@ -322,8 +322,8 @@ BSC32=bscmake.exe ...@@ -322,8 +322,8 @@ BSC32=bscmake.exe
# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
# PROP Target_Dir "" # PROP Target_Dir ""
CPP=cl.exe CPP=cl.exe
# ADD BASE CPP /nologo /W3 /GX- /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /YX /Gs8192 /GF /O2 /c # ADD BASE CPP /nologo /W3 /GX- /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /YX /Gs8192 /GF /O2 /c
# ADD CPP /nologo /W3 /GX- /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /YX /Gs8192 /GF /O2 /c # ADD CPP /nologo /W3 /GX- /I "." /I "..\include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /YX /Gs8192 /GF /O2 /c
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo # ADD LIB32 /nologo
......
...@@ -840,7 +840,8 @@ static int Demux_Seekable( demux_t *p_demux ) ...@@ -840,7 +840,8 @@ static int Demux_Seekable( demux_t *p_demux )
} }
else else
{ {
i_toread = __MAX( AVI_PTSToByte( tk, 20 * 1000 ), 100 ); i_toread = AVI_PTSToByte( tk, 20 * 1000 );
i_toread = __MAX( i_toread, 100 );
} }
} }
i_size = __MIN( tk->p_index[tk->i_idxposc].i_length - i_size = __MIN( tk->p_index[tk->i_idxposc].i_length -
......
...@@ -1161,8 +1161,8 @@ static void AStreamPrebufferStream( stream_t *s ) ...@@ -1161,8 +1161,8 @@ static void AStreamPrebufferStream( stream_t *s )
} }
/* */ /* */
i_read = __MIN( p_sys->stream.i_read_size, i_read = STREAM_CACHE_TRACK_SIZE - tk->i_end;
STREAM_CACHE_TRACK_SIZE - tk->i_end ); i_read = __MIN( p_sys->stream.i_read_size, i_read );
i_read = p_access->pf_read( p_access, &tk->p_buffer[tk->i_end], i_read = p_access->pf_read( p_access, &tk->p_buffer[tk->i_end],
i_read ); i_read );
if( i_read < 0 ) if( i_read < 0 )
......
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