summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-25 15:59:53 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-25 15:59:53 +0200
commite28e4a1b157bd0e9620fcff956d713a9921f506c (patch)
treed92e54e1e25feb84e692396cf234478f403e5738 /mplayer.c
parent560acfd0407c757e17bf72b490687d4947b05675 (diff)
parent213092c8dcfc925d8d54cf320b60cf298a870696 (diff)
downloadmpv-e28e4a1b157bd0e9620fcff956d713a9921f506c.tar.bz2
mpv-e28e4a1b157bd0e9620fcff956d713a9921f506c.tar.xz
Merge svn changes up to r30419
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 02341713d7..de1c8e08f0 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3554,10 +3554,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->stop_play = libmpdemux_was_interrupted(mpctx, PT_NEXT_ENTRY))) goto goto_next_file;
}