diff options
author | wm4 <wm4@nowhere> | 2016-02-24 10:23:50 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-02-24 10:23:50 +0100 |
commit | f0b15ad447927a794ee0785cd477348b10d875ae (patch) | |
tree | 4092c862a83b93e37106737357ddf1309ea71ac2 /video/out/vo_rpi.c | |
parent | 441b605de2738a0cc472a439a87a436ba1a86be2 (diff) | |
download | mpv-f0b15ad447927a794ee0785cd477348b10d875ae.tar.bz2 mpv-f0b15ad447927a794ee0785cd477348b10d875ae.tar.xz |
vo_opengl, vo_rpi: unbreak a few things
Commit 2f562825 didn't remove the "color" declaration for these. Since
the shader header already declares it, shader compilation broke.
Diffstat (limited to 'video/out/vo_rpi.c')
-rw-r--r-- | video/out/vo_rpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/out/vo_rpi.c b/video/out/vo_rpi.c index a3f104a13f..9d782fc9c5 100644 --- a/video/out/vo_rpi.c +++ b/video/out/vo_rpi.c @@ -144,12 +144,12 @@ static void update_osd(struct vo *vo) switch (fmt) { case SUBBITMAP_RGBA: { GLSLF("// OSD (RGBA)\n"); - GLSL(vec4 color = texture(osdtex, texcoord).bgra;) + GLSL(color = texture(osdtex, texcoord).bgra;) break; } case SUBBITMAP_LIBASS: { GLSLF("// OSD (libass)\n"); - GLSL(vec4 color = + GLSL(color = vec4(ass_color.rgb, ass_color.a * texture(osdtex, texcoord).r);) break; } |