From 98a31d5937e8397d8fcd0fefe56630a1cd765cf0 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 13 Jun 2014 02:05:37 +0200 Subject: options: turn --idx, --forceidx into --index Also clarify the semantics. It seems --idx didn't do anything. Possibly it used to change how the now removed legacy demuxers like demux_avi used to behave. Or maybe it was accidental. --forceidx basically becomes --index=force. It's possible that new index modes will be added in the future, so I'm keeping it extensible, instead of e.g. creating --force-index. --- DOCS/man/en/changes.rst | 2 ++ DOCS/man/en/options.rst | 21 +++++++-------------- 2 files changed, 9 insertions(+), 14 deletions(-) (limited to 'DOCS') diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst index 01a210fae8..f1f336ac7c 100644 --- a/DOCS/man/en/changes.rst +++ b/DOCS/man/en/changes.rst @@ -158,11 +158,13 @@ Command Line Switches ``-endpos`` ``--length`` ``-font`` ``--osd-font`` ``-forcedsubsonly`` ``--sub-forced-only`` + ``-forceidx`` ``--index`` ``-format`` ``--audio-format`` ``-fsmode-dontuse`` (removed) ``-fstype`` ``--x11-netwm`` (changed semantics) ``-hardframedrop`` ``--framedrop=hard`` ``-identify`` (removed; use TOOLS/mpv_identify.sh) + ``-idx`` ``--index`` ``-lavdopts ...`` ``--vd-lavc-...`` ``-lavfdopts`` ``--demuxer-lavf-...`` ``-lircconf`` ``--input-lirc-conf`` diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index d121fe2adc..e7044c53d8 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -826,15 +826,6 @@ OPTIONS Display only forced subtitles for the DVD subtitle stream selected by e.g. ``--slang``. -``--forceidx`` - Force index rebuilding. Useful for files with broken index (A/V desync, - etc). This will enable seeking in files where seeking was not possible. - - .. note:: - - This option only works if the underlying media supports seeking - (i.e. not with stdin, pipe, etc). - ``--fps=`` Override video framerate. Useful if the original value is wrong or missing. @@ -1129,11 +1120,13 @@ OPTIONS Mostly useful in slave mode, where mpv can be controlled through input commands (see also ``--slave-broken``). -``--idx`` - Rebuilds index of files if no index was found, allowing seeking. Useful - with broken/incomplete downloads or badly created files. Now this is done - automatically by the demuxers used for most video formats, meaning that - this switch has no effect in the typical case. See also ``--forceidx``. +``--index=`` + Controls how to seek in files. Note that if the index is missing from a + file, it will be built on the fly by default, so you don't need to change + this. But it might help with some broken files. + + :default: use an index if the file has one, or build it if missing + :recreate: don't read or use the file's index .. note:: -- cgit v1.2.3