summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-23 12:13:28 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-23 12:13:28 +0000
commit4e28b4bc9ed8e29daf3570596cc7a4c5325e8039 (patch)
tree7aa817a12cb9240d39470343c663f4cc61ed581a /mplayer.c
parent0e86058912f8ad3af2d49e0eedf01b585bd5732c (diff)
downloadmpv-4e28b4bc9ed8e29daf3570596cc7a4c5325e8039.tar.bz2
mpv-4e28b4bc9ed8e29daf3570596cc7a4c5325e8039.tar.xz
Change code to allow playing a stream even if enabling the cache failed
while still handling it when the user aborts the cache fill. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30402 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mplayer.c b/mplayer.c
index da0ebb5671..1eacaaf085 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3281,10 +3281,12 @@ if(mpctx->stream->type==STREAMTYPE_DVDNAV){
// CACHE2: initial prefill: 20% later: 5% (should be set by -cacheopts)
goto_enable_cache:
if(stream_cache_size>0){
+ int res;
current_module="enable_cache";
- if(!stream_enable_cache(mpctx->stream,stream_cache_size*1024,
+ res = stream_enable_cache(mpctx->stream,stream_cache_size*1024,
stream_cache_size*1024*(stream_cache_min_percent / 100.0),
- stream_cache_size*1024*(stream_cache_seek_min_percent / 100.0)))
+ stream_cache_size*1024*(stream_cache_seek_min_percent / 100.0));
+ if(res == 0)
if((mpctx->eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY))) goto goto_next_file;
}