* evc/libvlc.vcp.in: small fix.
# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"\r
# PROP Target_Dir ""\r
CPP=cl.exe\r
-# 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\r
-# 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\r
+# 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\r
+# 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\r
LIB32=link.exe -lib\r
# ADD BASE LIB32 /nologo\r
# ADD LIB32 /nologo\r
}
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_read = __MIN( p_sys->stream.i_read_size,
- STREAM_CACHE_TRACK_SIZE - tk->i_end );
+ i_read = 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 );
if( i_read < 0 )