diff options
| author | wm4 <wm4@nowhere> | 2015-03-16 20:39:24 +0100 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-03-17 10:49:56 +0900 |
| commit | 575b631d673ddb14de3e006c47100d3a4bfe8656 (patch) | |
| tree | d552373f627c9e349380351b6d66973ecd9ae636 | |
| parent | 4c1b45b5ab97ac1efd7fca1a7d97ddf4baca6826 (diff) | |
| download | mpv-575b631d673ddb14de3e006c47100d3a4bfe8656.tar.bz2 mpv-575b631d673ddb14de3e006c47100d3a4bfe8656.tar.xz | |
video: don't drop anamorphic scaling if it's too minor
This played e.g. a 1264x722 file as 1264x720. There was some code which
dropped the aspect ratio if the video (in original resolution) wasn't
scaled by more than 4 pixels. Commit 5f3c3f8c introduced this (although
I'm not really sure what the code replaced by it did).
Just remove this "feature".
(cherry picked from commit d96fad04bea738ae420f3c8da390e2c8932f5915)
| -rw-r--r-- | video/decode/dec_video.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c index eb7baf838d..5687abcb7d 100644 --- a/video/decode/dec_video.c +++ b/video/decode/dec_video.c @@ -402,6 +402,7 @@ int video_reconfig_filters(struct dec_video *d_video, if (sh->aspect > 0) vf_set_dar(&p.d_w, &p.d_h, p.w, p.h, sh->aspect); } else { + MP_VERBOSE(d_video, "Using bitstream aspect ratio.\n"); // Even if the aspect switches back, don't use container aspect again. d_video->initial_decoder_aspect = -1; } @@ -410,14 +411,6 @@ int video_reconfig_filters(struct dec_video *d_video, if (force_aspect >= 0.0) vf_set_dar(&p.d_w, &p.d_h, p.w, p.h, force_aspect); - if (abs(p.d_w - p.w) >= 4 || abs(p.d_h - p.h) >= 4) { - MP_VERBOSE(d_video, "Aspect ratio is %.2f:1 - " - "scaling to correct movie aspect.\n", sh->aspect); - } else { - p.d_w = p.w; - p.d_h = p.h; - } - // Apply user overrides if (opts->requested_colorspace != MP_CSP_AUTO) p.colorspace = opts->requested_colorspace; |