summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-12-16 18:54:06 +0100
committerwm4 <wm4@nowhere>2014-12-16 18:54:06 +0100
commit98d09f735e19494d03b1d485bb2205402664bf1a (patch)
tree1cc2d90c7df49f169eca2172f11b6ce7d8049c4c /video
parent4b65bd5086f832228303cd891a6abd231eeea790 (diff)
downloadmpv-98d09f735e19494d03b1d485bb2205402664bf1a.tar.bz2
mpv-98d09f735e19494d03b1d485bb2205402664bf1a.tar.xz
vo_opengl: fix broken rejection of extended scaling
Possibly explains why some users got mysterious FBO errors on crappy hardware.
Diffstat (limited to 'video')
-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 89572c9011..600b0e81b3 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -2071,9 +2071,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.)";
}