summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-12-11 23:56:20 +0100
committerwm4 <wm4@nowhere>2014-12-12 01:00:51 +0100
commit47452443c50f34219ed0744eae9492f56b32b878 (patch)
treeb5320533ab236b47e4f6aafc1a0a5562cdddac96 /DOCS
parent3dc8f63baabb9af519b125537808b8b27d82ab47 (diff)
downloadmpv-47452443c50f34219ed0744eae9492f56b32b878.tar.bz2
mpv-47452443c50f34219ed0744eae9492f56b32b878.tar.xz
demux: don't always make --cache-secs override --demuxer-readahead-secs
It's confusing. Whether the new behavior is less confusing... whatever.
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/options.rst5
1 files changed, 4 insertions, 1 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index a33dbac4e8..81f1501048 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -2154,6 +2154,9 @@ Demuxer
a timestamp difference higher than the readahead amount relative to the
last packet returned to the decoder, the demuxer keeps reading.
+ Note that the ``--cache-secs`` option will override this value if a cache
+ is enabled, and the value is larger.
+
(This value tends to be fuzzy, because many file formats don't store linear
timestamps.)
@@ -3027,7 +3030,7 @@ Cache
``--cache-secs=<seconds>``
How many seconds of audio/video to prefetch if the cache is active. This
overrides the ``--demuxer-readahead-secs`` option if and only if the cache
- is enabled. (Default: 2.)
+ is enabled and the value is larger. (Default: 2.)
``--cache-pause``, ``--no-cache-pause``
Whether the player should automatically pause when the cache runs low,