[Mplayer-cvslog] CVS: main mencoder.c,1.178,1.179 mplayer.c,1.601,1.602

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv7635

Modified Files:
	mencoder.c mplayer.c 
Log Message:
allow cache to be disabled (-nocache should override cachesize autodetection
in stream layer)


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- mencoder.c	23 Oct 2002 17:20:59 -0000	1.178
+++ mencoder.c	23 Oct 2002 22:07:11 -0000	1.179
@@ -77,7 +77,7 @@
 //--------------------------
 
 // cache2:
-int stream_cache_size=0;
+int stream_cache_size=-1;
 #ifdef USE_STREAM_CACHE
 extern int cache_fill_status;
 #else
@@ -446,7 +446,7 @@
   }
 #endif
 
-  if(stream_cache_size) stream_enable_cache(stream,stream_cache_size*1024,0,0);
+  if(stream_cache_size>0) stream_enable_cache(stream,stream_cache_size*1024,0,0);
 
   if(demuxer2) audio_id=-2; /* do NOT read audio packets... */
 

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.601
retrieving revision 1.602
diff -u -r1.601 -r1.602
--- mplayer.c	23 Oct 2002 17:20:59 -0000	1.601
+++ mplayer.c	23 Oct 2002 22:07:11 -0000	1.602
@@ -194,7 +194,7 @@
 char* filename=NULL; //"MI2-Trailer.avi";
 
 // cache2:
-       int stream_cache_size=0;
+       int stream_cache_size=-1;
 #ifdef USE_STREAM_CACHE
 extern int cache_fill_status;
 #else
@@ -977,7 +977,7 @@
 #endif
 
 // CACHE2: initial prefill: 20%  later: 5%  (should be set by -cacheopts)
-if(stream_cache_size){
+if(stream_cache_size>0){
   current_module="enable_cache";
   if(!stream_enable_cache(stream,stream_cache_size*1024,stream_cache_size*1024/5,stream_cache_size*1024/20))
     if((eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY))) goto goto_next_file;