summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-12-06 01:15:08 +0100
committerwm4 <wm4@nowhere>2015-12-06 01:15:08 +0100
commit0262295c4b6821d92770db0ad5c152fb6b04336b (patch)
tree24269aa87c3b8a0b08aacb93c746679ba87a4d81
parent48ed48f7b80a4e30f8b4718b1753d0583f0085dd (diff)
downloadmpv-0262295c4b6821d92770db0ad5c152fb6b04336b.tar.bz2
mpv-0262295c4b6821d92770db0ad5c152fb6b04336b.tar.xz
manpage: reflect recent subtitle changes
-rw-r--r--DOCS/man/input.rst6
-rw-r--r--DOCS/man/options.rst14
2 files changed, 10 insertions, 10 deletions
diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst
index 72004bf303..c3e69b3731 100644
--- a/DOCS/man/input.rst
+++ b/DOCS/man/input.rst
@@ -329,9 +329,9 @@ List of Input Commands
This is similar to ``sub-step``, except that it seeks video and audio
instead of adjusting the subtitle delay.
- Like with ``sub-step``, this works with external text subtitles only. For
- embedded text subtitles (like with Matroska), this works only with subtitle
- events that have already been displayed.
+ For embedded subtitles (like with Matroska), this works only with subtitle
+ events that have already been displayed, or are within a short prefetch
+ range.
``osd [<level>]``
Toggle OSD level. If ``<level>`` is specified, set the OSD mode
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 336be61e34..5e56f5c3ee 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -1334,8 +1334,8 @@ Subtitles
``--sub-speed=<0.1-10.0>``
Multiply the subtitle event timestamps with the given value. Can be used
- to fix the playback speed for frame-based subtitle formats. Works for
- external text subtitles only.
+ to fix the playback speed for frame-based subtitle formats. Affects text
+ subtitles only.
.. admonition:: Example
@@ -1583,17 +1583,17 @@ Subtitles
This mode doesn't take language or fallback codepage.
``--sub-fix-timing``, ``--no-sub-fix-timing``
- By default, external text subtitles are preprocessed to remove minor gaps
- or overlaps between subtitles (if the difference is smaller than 200 ms,
- the gap or overlap is removed). This does not affect image subtitles,
- subtitles muxed with audio/video, or subtitles in the ASS format.
+ By default, subtitle timing is adjusted to remove minor gaps or overlaps
+ between subtitles (if the difference is smaller than 200 ms, the gap or
+ overlap is removed).
``--sub-forced-only``
Display only forced subtitles for the DVD subtitle stream selected by e.g.
``--slang``.
``--sub-fps=<rate>``
- Specify the framerate of the subtitle file (default: video fps).
+ Specify the framerate of the subtitle file (default: video fps). Affects
+ text subtitles only.
.. note::