From 12bf06a1ada316cba4301ea29d806a99fb310197 Mon Sep 17 00:00:00 2001
From: arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 23 Oct 2002 22:07:29 +0000
Subject: [PATCH] allow cache to be disabled (-nocache should override
 cachesize autodetection in stream layer)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7882 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/network.c | 2 +-
 mencoder.c           | 4 ++--
 mplayer.c            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libmpdemux/network.c b/libmpdemux/network.c
index d49515cb13..1deaad1f3d 100644
--- a/libmpdemux/network.c
+++ b/libmpdemux/network.c
@@ -885,7 +885,7 @@ streaming_start(stream_t *stream, int *demuxer_type, URL_t *url) {
 		stream->streaming_ctrl = NULL;
 	} else if( stream->streaming_ctrl->buffering ) {
 		int cache_size = stream_cache_size; 
-		if(!stream_cache_size) {
+		if(stream_cache_size<0) {
 			// cache option not set, will use our computed value.
 			// buffer in KBytes, *5 because the prefill is 20% of the buffer.
 			stream_cache_size = (stream->streaming_ctrl->prebuffer_size/1024)*5;
diff --git a/mencoder.c b/mencoder.c
index fd57a6f576..ccb33894ac 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -77,7 +77,7 @@ int vo_config_count=0;
 //--------------------------
 
 // 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 @@ if(stream->type==STREAMTYPE_DVD){
   }
 #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... */
 
diff --git a/mplayer.c b/mplayer.c
index 4c0f87f9de..84f1e30f47 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -194,7 +194,7 @@ int vcd_track=0;
 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 @@ if(stream->type==STREAMTYPE_DVD){
 #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;