summaryrefslogtreecommitdiffstats
path: root/DOCS/man
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-07-21 20:19:39 +0200
committerwm4 <wm4@nowhere>2017-07-21 20:19:39 +0200
commit2378acc3b3e9825765c549e025bc1ca83064cced (patch)
tree186f115fad588eeccec369690cbd594788f8331a /DOCS/man
parent533ff28574ef179524a1f25b0b145d92137457a7 (diff)
downloadmpv-2378acc3b3e9825765c549e025bc1ca83064cced.tar.bz2
mpv-2378acc3b3e9825765c549e025bc1ca83064cced.tar.xz
options: drop --video-aspect-method=hybrid
Remove this code because it could be argued that it contains GPL-only code (see commit 642e963c860 for details). The remaining aspect methods appear to work just as well, are potentially more compatible to other players, and the code becomes much simpler.
Diffstat (limited to 'DOCS/man')
-rw-r--r--DOCS/man/options.rst5
1 files changed, 1 insertions, 4 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index bb5ba6636a..df640c8af5 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -835,13 +835,10 @@ Video
- ``--video-aspect=16:9`` or ``--video-aspect=1.7777``
- ``--no-video-aspect`` or ``--video-aspect=no``
-``--video-aspect-method=<hybrid|bitstream|container>``
+``--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).
- :hybrid: Prefer the container aspect ratio. If the bitstream aspect
- switches mid-stream, switch to preferring the bitstream aspect.
- This was the default in older mpv and mplayer2. Deprecated.
:container: Strictly prefer the container aspect ratio. This is apparently
the default behavior with VLC, at least with Matroska. Note that
if the container has no aspect ratio set, the behavior is the