summaryrefslogtreecommitdiffstats
path: root/DOCS/man/options.rst
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.xyz>2019-10-04 18:45:37 +0200
committerNiklas Haas <github-c6e1c8@haasn.xyz>2019-10-04 21:34:22 +0200
commitcb95ce75b5c114b6fd2c6b37ac6941b6848c8014 (patch)
tree8b5efcb27976dd475a867767c661ed9715a8112c /DOCS/man/options.rst
parent6064720011c7864bb97b4bb6dd2872246908c1c5 (diff)
downloadmpv-cb95ce75b5c114b6fd2c6b37ac6941b6848c8014.tar.bz2
mpv-cb95ce75b5c114b6fd2c6b37ac6941b6848c8014.tar.xz
options: rename --video-aspect to --video-aspect-override
The justification for this is the fact that the `video-aspect` property doesn't work well with `cycle_values` commands that include the value "-1". The "video-aspect" property has effectively no change in behavior, but we may want to make it read-only in the future. I think it's probably fine to leave as-is, though. Fixes #6068.
Diffstat (limited to 'DOCS/man/options.rst')
-rw-r--r--DOCS/man/options.rst16
1 files changed, 8 insertions, 8 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 69a28f1b7a..52f179051d 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -1173,9 +1173,9 @@ Video
This option has no effect if ``--video-unscaled`` option is used.
-``--video-aspect=<ratio|no>``
+``--video-aspect-override=<ratio|no>``
Override video aspect ratio, in case aspect information is incorrect or
- missing in the file being played. See also ``--no-video-aspect``.
+ missing in the file being played.
These values have special meaning:
@@ -1187,13 +1187,13 @@ Video
.. admonition:: Examples
- - ``--video-aspect=4:3`` or ``--video-aspect=1.3333``
- - ``--video-aspect=16:9`` or ``--video-aspect=1.7777``
- - ``--no-video-aspect`` or ``--video-aspect=no``
+ - ``--video-aspect-override=4:3`` or ``--video-aspect-override=1.3333``
+ - ``--video-aspect-override=16:9`` or ``--video-aspect-override=1.7777``
+ - ``--no-video-aspect-override`` or ``--video-aspect-override=no``
``--video-aspect-method=<bitstream|container>``
This sets the default video aspect determination method (if the aspect is
- _not_ overridden by the user with ``--video-aspect`` or others).
+ _not_ overridden by the user with ``--video-aspect-override`` or others).
:container: Strictly prefer the container aspect ratio. This is apparently
the default behavior with VLC, at least with Matroska. Note that
@@ -2814,7 +2814,7 @@ Window
previous setting (e.g. in the config file). Overrides the
``--monitorpixelaspect`` setting if enabled.
- See also ``--monitorpixelaspect`` and ``--video-aspect``.
+ See also ``--monitorpixelaspect`` and ``--video-aspect-override``.
.. admonition:: Examples
@@ -2835,7 +2835,7 @@ Window
``--monitorpixelaspect=<ratio>``
Set the aspect of a single pixel of your monitor or TV screen (default:
1). A value of 1 means square pixels (correct for (almost?) all LCDs). See
- also ``--monitoraspect`` and ``--video-aspect``.
+ also ``--monitoraspect`` and ``--video-aspect-override``.
``--stop-screensaver``, ``--no-stop-screensaver``
Turns off the screensaver (or screen blanker and similar mechanisms) at