summaryrefslogtreecommitdiffstats
path: root/core/timeline/tl_matroska.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-10 15:03:54 +0200
committerwm4 <wm4@nowhere>2013-07-10 15:05:24 +0200
commit175cd3cb570525fd4ed8f6ec66e3a66a461cc896 (patch)
treeefd5b88dfc15f077601aa899c45f5a21be69f925 /core/timeline/tl_matroska.c
parent1d48b11478b346411d57b8fee1c242591f9b83c5 (diff)
downloadmpv-175cd3cb570525fd4ed8f6ec66e3a66a461cc896.tar.bz2
mpv-175cd3cb570525fd4ed8f6ec66e3a66a461cc896.tar.xz
options: add --cache-default option
Add this option, which lets users set the cache size without forcing it even when playing from the local filesystem. Also document the default value explicitly. The Matroska linked segments case is slightly simplified: they can never come from network (mostly because it'd be insane, and we can't even list files from network sources), so the cache will never be enabled automatically.
Diffstat (limited to 'core/timeline/tl_matroska.c')
-rw-r--r--core/timeline/tl_matroska.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/timeline/tl_matroska.c b/core/timeline/tl_matroska.c
index 11fcc67583..098c02fd9f 100644
--- a/core/timeline/tl_matroska.c
+++ b/core/timeline/tl_matroska.c
@@ -126,8 +126,7 @@ static int enable_cache(struct MPContext *mpctx, struct stream **stream,
{
struct MPOpts *opts = &mpctx->opts;
- if (!(opts->stream_cache_size > 0 ||
- opts->stream_cache_size < 0 && (*stream)->cache_size))
+ if (opts->stream_cache_size <= 0)
return 0;
char *filename = talloc_strdup(NULL, (*demuxer)->filename);
@@ -143,6 +142,7 @@ static int enable_cache(struct MPContext *mpctx, struct stream **stream,
stream_enable_cache_percent(stream,
opts->stream_cache_size,
+ opts->stream_cache_def_size,
opts->stream_cache_min_percent,
opts->stream_cache_seek_min_percent);