summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiklas Haas <git@nand.wakku.to>2015-07-23 20:40:42 +0200
committerwm4 <wm4@nowhere>2015-07-23 21:53:03 +0200
commit86a60a4dd22a717a069346acf4a6171837fb01b3 (patch)
treed9f12831e649bfb812f933ed60d07bebc437e711
parent281c21b7f1d7ccea253beb6d99d35ac485262aa3 (diff)
downloadmpv-86a60a4dd22a717a069346acf4a6171837fb01b3.tar.bz2
mpv-86a60a4dd22a717a069346acf4a6171837fb01b3.tar.xz
vo_opengl: fix scale=oversample's threshold calculations
This resulted in wrong behavior for values of scale-param1 between 0.0 and 0.5 (not inclusive).
-rw-r--r--video/out/gl_video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index 92d74ee8e6..610a8fdb25 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -1314,7 +1314,7 @@ static void pass_sample_oversample(struct gl_video *p, struct scaler *scaler,
GLSLF("coeff = mix(coeff, vec2(0.0), "
"lessThanEqual(coeff, vec2(%f)));\n", threshold);
GLSLF("coeff = mix(coeff, vec2(1.0), "
- "greaterThanEqual(coeff, vec2(%f)));\n", threshold);
+ "greaterThanEqual(coeff, vec2(%f)));\n", 1.0 - threshold);
}
// Compute the right blend of colors
GLSL(vec4 left = mix(texture(tex, baseSW),