summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-12-16 18:54:06 +0100
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-01-25 17:00:08 +0900
commit676457256a17fd26ca5d0fcd3effa9d923dbd3e2 (patch)
tree7eadaec13cd00065c4ee911adb4c4f6f0ba6cea3
parent7368d8f35312b1ae5123b64f1728030e1b85bc37 (diff)
downloadmpv-676457256a17fd26ca5d0fcd3effa9d923dbd3e2.tar.bz2
mpv-676457256a17fd26ca5d0fcd3effa9d923dbd3e2.tar.xz
vo_opengl: fix broken rejection of extended scaling
Possibly explains why some users got mysterious FBO errors on crappy hardware.
-rw-r--r--video/out/gl_video.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index 1788bcbc99..44445575fa 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -2079,9 +2079,8 @@ static void check_gl_features(struct gl_video *p)
// Without FP textures, we must always disable them.
if (!have_float_tex || (!have_fbo && p->opts.scale_sep)) {
for (int n = 0; n < 2; n++) {
- struct scaler *scaler = &p->scalers[n];
- if (mp_find_filter_kernel(scaler->name)) {
- scaler->name = "bilinear";
+ if (mp_find_filter_kernel(p->opts.scalers[n])) {
+ p->opts.scalers[n] = "bilinear";
disabled[n_disabled++]
= have_float_tex ? "scaler (FBO)" : "scaler (float tex.)";
}