summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
Diffstat (limited to 'video')
-rw-r--r--video/out/gl_video.c2
-rw-r--r--video/out/gl_video_shaders.glsl3
2 files changed, 3 insertions, 2 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index 5f63c9517f..22f4100e9a 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -703,8 +703,6 @@ static void compile_shaders(struct gl_video *p)
shader_def(&header_conv, "USE_CONV", "CONV_NV12");
} else if (p->plane_count > 1) {
shader_def(&header_conv, "USE_CONV", "CONV_PLANAR");
- } else {
- shader_def(&header_conv, "USE_CONV", "0");
}
shader_def_opt(&header_conv, "USE_GBRP", p->image_format == IMGFMT_GBRP);
diff --git a/video/out/gl_video_shaders.glsl b/video/out/gl_video_shaders.glsl
index ee7baa7f6c..2f10e5fdf6 100644
--- a/video/out/gl_video_shaders.glsl
+++ b/video/out/gl_video_shaders.glsl
@@ -319,6 +319,9 @@ vec4 sample_sharpen5(sampler2D tex, vec2 texsize, vec2 texcoord) {
}
void main() {
+#ifndef USE_CONV
+#define USE_CONV 0
+#endif
#if USE_CONV == CONV_PLANAR
vec3 color = vec3(SAMPLE_L(textures[0], textures_size[0], texcoord).r,
SAMPLE_C(textures[1], textures_size[1], texcoord).r,