summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-03-22 13:34:39 +0100
committerwm4 <wm4@nowhere>2016-03-22 13:34:52 +0100
commitfd3ae6c561e4e53c994eb802630fef00a2e0a18b (patch)
tree57a1c767705e7aaff6f4359addd42fb82455cc98
parentc8b6ca9070a7e0ed0826e86b3948af57ce7aeaa2 (diff)
downloadmpv-fd3ae6c561e4e53c994eb802630fef00a2e0a18b.tar.bz2
mpv-fd3ae6c561e4e53c994eb802630fef00a2e0a18b.tar.xz
vo_opengl: fix blend-subtitles=video in some cases
Shader miscompilation and bad output. Regression probably since commit 93546f0c (or one of the following ones). Fixes #2982.
-rw-r--r--video/out/opengl/video.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c
index a1e98bef14..b1c2231bb0 100644
--- a/video/out/opengl/video.c
+++ b/video/out/opengl/video.c
@@ -2113,6 +2113,7 @@ static void pass_render_frame(struct gl_video *p)
pass_draw_osd(p, OSD_DRAW_SUB_ONLY, vpts, rect,
p->texture_w, p->texture_h, p->blend_subs_fbo.fbo, false);
GLSL(color = texture(texture0, texcoord0);)
+ pass_read_fbo(p, &p->blend_subs_fbo);
}
apply_shaders(p, p->opts.pre_shaders, p->texture_w, p->texture_h, p->pre_fbo);