summaryrefslogtreecommitdiffstats
path: root/video/decode
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-03-16 20:39:24 +0100
committerwm4 <wm4@nowhere>2015-03-16 20:39:24 +0100
commitd96fad04bea738ae420f3c8da390e2c8932f5915 (patch)
tree0a80e2b0f951b6d830844131e8dd7f9b71dfcfdd /video/decode
parent420e657a0b9f4fdd18b4d70a0fd289de9a140a60 (diff)
downloadmpv-d96fad04bea738ae420f3c8da390e2c8932f5915.tar.bz2
mpv-d96fad04bea738ae420f3c8da390e2c8932f5915.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".
Diffstat (limited to 'video/decode')
-rw-r--r--video/decode/dec_video.c9
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;