From b266a334c12fb15d76921517fac38179f9bf99be Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 29 Jun 2017 22:34:57 +0200 Subject: [PATCH] video: change --video-aspect-method default value again I noticed that the previous default, bitstream, actually breaks with some shitty anamorphic DVD rips that signal square pixel aspect in the bitstream. So I think the "container" method is a better default. --- DOCS/man/options.rst | 15 +++++++++------ options/options.c | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 1fd484c4da..2be7de2195 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -825,15 +825,18 @@ Video 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. + the default behavior with VLC, at least with Matroska. Note that + if the container has no aspect ratio set, the behavior is the + same as with bitstream. :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, and the current default - for mpv. + 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. + The current default for mpv is ``container``. + + Normally you should not set this. Try the various 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, diff --git a/options/options.c b/options/options.c index 4c42164111..3827709dcc 100644 --- a/options/options.c +++ b/options/options.c @@ -928,7 +928,7 @@ const struct MPOpts mp_default_opts = { .playback_speed = 1., .pitch_correction = 1, .movie_aspect = -1., - .aspect_method = 1, + .aspect_method = 2, .field_dominance = -1, .sub_auto = 0, .audiofile_auto = -1,