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

* evc/libvlc.vcp.in: small fix.

diff --git a/evc/libvlc.vcp.in b/evc/libvlc.vcp.in
index f30e54c70852e7b3379f8e5a9235024fc355187f..ac6555d2fd0a94ac4248067eda53e4c4f6780b0e 100644 (file)
--- a/evc/libvlc.vcp.in
+++ b/evc/libvlc.vcp.in
@@ -322,8 +322,8 @@ BSC32=bscmake.exe
 # 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

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 4ff2f0c85c5c728ee4c9adcdad18b3a9dda73edf..caad59b93124527ce9519f6a9229bd4e3f797b81 100644 (file)
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -840,7 +840,8 @@ static int Demux_Seekable( demux_t *p_demux )
                 }
                 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 -

diff --git a/src/input/stream.c b/src/input/stream.c
index 7347d5adaef964079ec1627510fe49691b1e2516..aefd3d0d636faa2e0ff8c67faf4242381bae42fe 100644 (file)
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -1161,8 +1161,8 @@ static void AStreamPrebufferStream( stream_t *s )
         }
 
         /* */
-        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 )