diff options
author | wm4 <wm4@nowhere> | 2014-05-04 10:31:24 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-05-04 10:31:24 +0200 |
commit | 94441ed13963356fa25f7e52a12e36387220ebba (patch) | |
tree | ae240ca341bf05447b35d5c74dcb8e54e9addb6d /DOCS | |
parent | f26fe90c8af7fe9d394ab4d000de9d34796ba05c (diff) | |
download | mpv-94441ed13963356fa25f7e52a12e36387220ebba.tar.bz2 mpv-94441ed13963356fa25f7e52a12e36387220ebba.tar.xz |
options: merge ---sub-auto-match with --sub-auto
There's no reason why these should be separate.
Diffstat (limited to 'DOCS')
-rw-r--r-- | DOCS/man/en/changes.rst | 2 | ||||
-rw-r--r-- | DOCS/man/en/options.rst | 15 |
2 files changed, 7 insertions, 10 deletions
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst index e06f779ec9..9e059b360c 100644 --- a/DOCS/man/en/changes.rst +++ b/DOCS/man/en/changes.rst @@ -195,7 +195,7 @@ Command Line Switches ``-srate`` ``--audio-samplerate`` ``-ss`` ``--start`` ``-stop-xscreensaver`` ``--stop-screensaver`` - ``-sub-fuzziness`` ``--sub-auto-match`` + ``-sub-fuzziness`` ``--sub-auto`` ``-sub`` ``--sub-file`` ``-subcp`` ``--sub-codepage`` ``-subdelay`` ``--sub-delay`` diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index bb8f58968c..bb178ce448 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -2168,19 +2168,16 @@ OPTIONS Use/display these subtitle files. Only one file can be displayed at the same time. -``--sub-auto``, ``--no-sub-auto`` - Load additional subtitle files matching the video filename. Enabled by - default. See also ``--sub-auto-match``. +``--sub-auto=<no|exact|fuzzy|all>``, ``--no-sub-auto`` + Load additional subtitle files matching the video filename. The parameter + specifies how external subtitle files are matched. ``exact`` is enabled by + default. -``--sub-auto-match=<exact|fuzzy|all>`` - Adjust matching fuzziness when searching for subtitles: - - :exact: exact match + :no: Don't automatically load external subtitle files. + :exact: Load the media filename with subtitle file extension (default). :fuzzy: Load all subs containing movie name. :all: Load all subs in the current and ``--sub-paths`` directories. - (default: exact) - ``--sub-paths=<path1:path2:...>`` Specify extra directories to search for subtitles matching the video. Multiple directories can be separated by ":" (";" on Windows). |