summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-08-30 23:01:46 +0200
committerwm4 <wm4@nowhere>2015-08-30 23:04:17 +0200
commit82f0d373fbecc18cd2ddc748f0b330160845f2cd (patch)
treea519cd102de6508c039ded4e2499caac67560f24 /DOCS
parent061b947c843dd240a29b54e76d0ad002f6821b56 (diff)
downloadmpv-82f0d373fbecc18cd2ddc748f0b330160845f2cd.tar.bz2
mpv-82f0d373fbecc18cd2ddc748f0b330160845f2cd.tar.xz
video: make container vs. bitstream aspect ratio configurable
Utterly idiotic bullshit. Fixes #2259.
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/interface-changes.rst1
-rw-r--r--DOCS/man/options.rst17
2 files changed, 18 insertions, 0 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index 9d1390c808..2d103ebfb3 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -20,6 +20,7 @@ Interface changes
::
--- mpv 0.10.0 will be released ---
+ - add --video-aspect-method option
- add --playlist-pos option
- add --video-sync* options
"display-sync-active" property
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index c8b2460879..f1d045622a 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -633,6 +633,23 @@ Video
Ignore aspect ratio information from video file and assume the video has
square pixels. See also ``--video-aspect``.
+``--video-aspect-method=<hybrid|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 is the default behavior in mpv and mplayer2.
+ :container: Strictly prefer the container aspect ratio. This is apparently
+ the default behavior with VLC, at least with Matroska.
+ :bitstream: Strictly prefer the bitstream aspect ratio, unless the bitstream
+ aspect ratio is not set. This is apparently the default behavior
+ with XBMC/kodi, at least with Matroska.
+
+ Normally you should not set this. Try the ``container`` and ``bitstream``
+ choices if you encounter video that has the wrong aspect ratio in mpv,
+ but seems to be correct in other players.
+
``--video-unscaled``
Disable scaling of the video. If the window is larger than the video,
black bars are added. Otherwise, the video is cropped. The video still