diff options
| author | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
| commit | 84829a4ea1903e5db5782b72861fabc503a589cb (patch) | |
| tree | 26b4acbaf6dd4b255278dcc67f28bd83357c3b86 /DOCS/man/en/vf.rst | |
| parent | e45dd051c304dec189d0d4d792a89c2988c3fa71 (diff) | |
| parent | f4069259cf7ffd24ac2a5b64e26a386185e94c7b (diff) | |
| download | mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.bz2 mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.xz | |
Merge branch 'osd_changes' into master
Conflicts:
DOCS/man/en/options.rst
Diffstat (limited to 'DOCS/man/en/vf.rst')
| -rw-r--r-- | DOCS/man/en/vf.rst | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/DOCS/man/en/vf.rst b/DOCS/man/en/vf.rst index d46bd5bc06..31947e82b6 100644 --- a/DOCS/man/en/vf.rst +++ b/DOCS/man/en/vf.rst @@ -663,15 +663,15 @@ screenshot not always safe to insert this filter by default. See the ``Taking screenshots`` section for details. -ass - Moves SSA/ASS subtitle rendering to an arbitrary point in the filter +sub + Moves subtitle rendering to an arbitrary point in the filter chain, or force subtitle rendering in the video filter as opposed to using - video output EOSD support. See the ``--ass`` option. + video output OSD support. *EXAMPLE*: - ``--vf=ass,eq`` - Moves SSA/ASS rendering before the eq filter. This will put both + ``--vf=sub,eq`` + Moves sub rendering before the eq filter. This will put both subtitle colors and video under the influence of the video equalizer settings. |