diff options
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/man/en/changes.rst | 4 | ||||
| -rw-r--r-- | DOCS/man/en/mpv.rst | 20 | ||||
| -rw-r--r-- | DOCS/man/en/vf.rst | 3 |
3 files changed, 10 insertions, 17 deletions
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst index 6f85c5ab38..eb3f4d0d91 100644 --- a/DOCS/man/en/changes.rst +++ b/DOCS/man/en/changes.rst @@ -53,7 +53,9 @@ General changes for mplayer2 to mpv * Make ``--softvol`` default (**mpv** is not a mixer control panel) * Improved support for .cue files * Screenshot improvements (can save screenshots as JPG or PNG, configurable - filenames, support for taking screenshots with or without subtitles) + filenames, support for taking screenshots with or without subtitles - the + ``screenshot`` video filter is not needed anymore, and should not be put + into the mpv config file) * Removal of teletext support * Replace image VOs (``--vo=jpeg`` etc.) with ``--vo=image`` * Do not lose settings when playing a new file in the same player instance diff --git a/DOCS/man/en/mpv.rst b/DOCS/man/en/mpv.rst index 73d8b0a06b..d8fa642546 100644 --- a/DOCS/man/en/mpv.rst +++ b/DOCS/man/en/mpv.rst @@ -417,19 +417,13 @@ available number - no files will be overwritten. A screenshot will usually contain the unscaled video contents at the end of the video filter chain and subtitles. By default the ``S`` takes screenshots without -subtitles. Some video output drivers will always include subtitles and OSD in -the video frame as well - this is because of technical restrictions. - -The ``screenshot`` video filter is normally not required when using a -recommended GUI video output driver. The ``screenshot`` filter will be attempted -to be used if the video output doesn't support screenshots. Note that taking -screenshots with the video filter is not instant: the screenshot will be only -saved when the next video frame is displayed. This means attempting to take a -screenshot while the player is paused will do nothing, until the user unpauses -or seeks. Also, the screenshot filter is not compatible with hardware decoding, -and actually will cause initialization failure when use with hardware decoding -is attempted. Using the ``screenshot`` video filter is not recommended for -these reasons. +subtitles, while ``s`` includes subtitles. + +The ``screenshot`` video filter is not required when using a recommended GUI +video output driver. It should normally not be added to the config file, as +taking screenshots is handled by the VOs, and adding the screenshot filter will +break hardware decoding. (The filter may still be useful for taking screenshots +at a certain point within the video chain when using multiple video filters.) .. include:: changes.rst diff --git a/DOCS/man/en/vf.rst b/DOCS/man/en/vf.rst index 09fb4e37c0..e993f8ec59 100644 --- a/DOCS/man/en/vf.rst +++ b/DOCS/man/en/vf.rst @@ -658,9 +658,6 @@ screenshot not always safe to insert this filter by default. See the ``Taking screenshots`` section for details. -screenshot_force - Same as ``screenshot``, but prefer it over VO based screenshot code. - sub=[=bottom-margin:top-margin] Moves subtitle rendering to an arbitrary point in the filter chain, or force subtitle rendering in the video filter as opposed to using |