summaryrefslogtreecommitdiffstats
path: root/video/out/opengl/video.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-03-29 21:56:38 +0200
committerwm4 <wm4@nowhere>2016-03-29 21:56:38 +0200
commitdae23fff09337992f9773557a3ba41ffb1311b32 (patch)
tree2a9d7a56c6c844395986b7093da27012eb9cc7c6 /video/out/opengl/video.c
parentb95a10c2dd9d73d13375de1c802c2124478f6d88 (diff)
downloadmpv-dae23fff09337992f9773557a3ba41ffb1311b32.tar.bz2
mpv-dae23fff09337992f9773557a3ba41ffb1311b32.tar.xz
vo_opengl: always premultiply alpha
Until now, we've let the windowing backend decide. But since they usually require premultiplied alpha, and premultiplied alpha is easier to handle, hardcode it.
Diffstat (limited to 'video/out/opengl/video.c')
-rw-r--r--video/out/opengl/video.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c
index de9fdd2814..6b46c1fb42 100644
--- a/video/out/opengl/video.c
+++ b/video/out/opengl/video.c
@@ -1736,8 +1736,7 @@ static void pass_convert_yuv(struct gl_video *p)
GLSL(color.rgb = color.rgb * color.a + background * (1.0 - color.a);)
} else { // alpha present in image
p->components = 4;
- if (p->gl->fb_premultiplied)
- GLSL(color = vec4(color.rgb * color.a, color.a);)
+ GLSL(color = vec4(color.rgb * color.a, color.a);)
}
}