diff options
| author | wm4 <wm4@nowhere> | 2013-06-04 00:29:29 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-06-04 00:29:44 +0200 |
| commit | 92ae48db0f91fbfcfbb1722fa81c922808f62d5a (patch) | |
| tree | e32fe21b5f8c11ada7788768a76e2d9f7d061c66 /DOCS/man/en | |
| parent | daf8ed831b4ae63cf0931cc3d6727956137f865f (diff) | |
| parent | c1ac97b99b3e80bbf84ed540178dd6689ead0b87 (diff) | |
| download | mpv-92ae48db0f91fbfcfbb1722fa81c922808f62d5a.tar.bz2 mpv-92ae48db0f91fbfcfbb1722fa81c922808f62d5a.tar.xz | |
Merge branch 'sub_mess'
This branch heavily refactors the subtitle code (both loading and
rendering), and adds support for a few new formats through FFmpeg.
We don't remove any of the old code yet. There are still some subtleties
related to subreader.c to be resolved: code page detection & conversion,
timing post-processing, UTF-16 subtitle support, support for the -subfps
option. Also, SRT reading and loading ASS via libass should be turned
into proper demuxers. (SRT is needed because Libav's is gravely broken,
and we want ASS loading via libass to cover full libass format support.
Both should be demuxers which are probed _before_ libavformat, so that
all subtitles can be loaded through the demuxer infrastructure, and
libavformat subtitles don't need to be treated in a special way.)
Diffstat (limited to 'DOCS/man/en')
| -rw-r--r-- | DOCS/man/en/options.rst | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index f1aea822e7..8239375079 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -93,13 +93,11 @@ - ``--aspect=16:9`` or ``--aspect=1.7777`` --ass, --no-ass - Render ASS subtitles natively, and convert text subtitles in other formats - to ASS internally (enabled by default). + Render ASS subtitles natively (enabled by default). - If ``--no-ass`` is specified, all subtitles are converted to plain text - internally. All tags and style declarations are stripped and ignored. The - subtitle renderer uses the font style as specified by the ``--sub-text-`` - options instead. + If ``--no-ass`` is specified, all tags and style declarations are stripped + and ignored on display. The subtitle renderer uses the font style as + specified by the ``--sub-text-`` options instead. *NOTE*: Using ``--no-ass`` may lead to incorrect or completely broken rendering of ASS/SSA subtitles. It can sometimes be useful to forcibly @@ -1287,7 +1285,10 @@ See ``quit_watch_later`` input command. --no-sub - Disables display of internal and external subtitles. + Don't select any subtitle when the file is loaded. + +--no-sub-visibility + Disable display of subtitles, but still select and decode them. --no-video Do not play video. With some demuxers this may not work. In those cases |