Merge branch 'osd_changes' into master

Conflicts:
	DOCS/man/en/options.rst

1 files changed, 3 insertions, 4 deletions

diff --git a/libvo/vo_opengl_shaders.glsl b/libvo/vo_opengl_shaders.glsl
index 207b44b4ba..01e1433f7f 100644
--- a/libvo/vo_opengl_shaders.glsl
+++ b/libvo/vo_opengl_shaders.glsl
@@ -67,7 +67,7 @@ void main() {
     texcoord = vertex_texcoord;
 }
 
-#!section frag_eosd
+#!section frag_osd_libass
 uniform sampler2D textures[3];
 
 in vec2 texcoord;
@@ -78,15 +78,14 @@ void main() {
     out_color = vec4(color.rgb, color.a * texture(textures[0], texcoord).r);
 }
 
-#!section frag_osd
+#!section frag_osd_rgba
 uniform sampler2D textures[3];
 
 in vec2 texcoord;
-in vec4 color;
 DECLARE_FRAGPARMS
 
 void main() {
-    out_color = texture(textures[0], texcoord).rrrg * color;
+    out_color = texture(textures[0], texcoord);
 }
 
 #!section frag_video