summaryrefslogtreecommitdiffstats
path: root/video/image_writer.h
diff options
context:
space:
mode:
authorNiklas Haas <git@nand.wakku.to>2015-02-28 20:15:12 +0100
committerNiklas Haas <git@nand.wakku.to>2015-02-28 20:23:47 +0100
commita76cc1dafcf948cce93f6d258e33444206a83c45 (patch)
tree89e3bb2afb4192ee1e8f54aa9943927535845269 /video/image_writer.h
parent8d24e9d9b8ad1b5d82139980eca148dc0f4a1eab (diff)
downloadmpv-a76cc1dafcf948cce93f6d258e33444206a83c45.tar.bz2
mpv-a76cc1dafcf948cce93f6d258e33444206a83c45.tar.xz
Revert "Revert recent vo_opengl related commits"
Omitted a simple, but devastasting check. Fixed the relevant commits now. This reverts commit 8d24e9d9b8ad1b5d82139980eca148dc0f4a1eab. diff --git a/video/out/gl_video.c b/video/out/gl_video.c index 9c8a643..f1ea03e 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -1034,9 +1034,9 @@ static void compile_shaders(struct gl_video *p) shader_def_opt(&header_conv, "USE_CONV_GAMMA", use_conv_gamma); shader_def_opt(&header_conv, "USE_CONST_LUMA", use_const_luma); shader_def_opt(&header_conv, "USE_LINEAR_LIGHT_BT1886", - gamma_fun == MP_CSP_TRC_BT_1886); + use_linear_light && gamma_fun == MP_CSP_TRC_BT_1886); shader_def_opt(&header_conv, "USE_LINEAR_LIGHT_SRGB", - gamma_fun == MP_CSP_TRC_SRGB); + use_linear_light && gamma_fun == MP_CSP_TRC_SRGB); shader_def_opt(&header_conv, "USE_SIGMOID", use_sigmoid); if (p->opts.alpha_mode > 0 && p->has_alpha && p->plane_count > 3) shader_def(&header_conv, "USE_ALPHA_PLANE", "3");
Diffstat (limited to 'video/image_writer.h')
-rw-r--r--video/image_writer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/video/image_writer.h b/video/image_writer.h
index 2fce63065e..272af73b05 100644
--- a/video/image_writer.h
+++ b/video/image_writer.h
@@ -28,6 +28,7 @@ struct image_writer_opts {
int jpeg_dpi;
int jpeg_progressive;
int jpeg_baseline;
+ int tag_csp;
};
extern const struct image_writer_opts image_writer_opts_defaults;