From 2378acc3b3e9825765c549e025bc1ca83064cced Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 21 Jul 2017 20:19:39 +0200 Subject: 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. --- DOCS/interface-changes.rst | 1 + DOCS/man/options.rst | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'DOCS') diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 2fd57c9e90..a9a6664461 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -25,6 +25,7 @@ Interface changes - remove client API compatibility handling for "script", "sub-file", "audio-file", "external-file" (these cases used to log a deprecation warning) + - drop deprecated --video-aspect-method=hybrid option choice --- mpv 0.26.0 --- - remove remaining deprecated audio device options, like --alsa-device Some of them were removed in earlier releases. 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=`` +``--video-aspect-method=`` 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 -- cgit v1.2.3