mirror of
https://github.com/mpv-player/mpv
synced 2024-12-21 22:30:22 +00:00
a76cc1dafc
Omitted a simple, but devastasting check. Fixed the relevant commits
now.
This reverts commit 8d24e9d9b8.
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");
56 lines
1.9 KiB
C
56 lines
1.9 KiB
C
/*
|
|
* This file is part of mplayer.
|
|
*
|
|
* mplayer is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* mplayer is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with mplayer. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
struct mp_image;
|
|
struct mp_log;
|
|
|
|
struct image_writer_opts {
|
|
char *format;
|
|
int png_compression;
|
|
int png_filter;
|
|
int jpeg_quality;
|
|
int jpeg_optimize;
|
|
int jpeg_smooth;
|
|
int jpeg_dpi;
|
|
int jpeg_progressive;
|
|
int jpeg_baseline;
|
|
int tag_csp;
|
|
};
|
|
|
|
extern const struct image_writer_opts image_writer_opts_defaults;
|
|
|
|
extern const struct m_sub_options image_writer_conf;
|
|
|
|
// Return the file extension that will be used, e.g. "png".
|
|
const char *image_writer_file_ext(const struct image_writer_opts *opts);
|
|
|
|
/*
|
|
* Save the given image under the given filename. The parameters csp and opts
|
|
* are optional. All pixel formats supported by swscale are supported.
|
|
*
|
|
* File format and compression settings are controlled via the opts parameter.
|
|
*
|
|
* NOTE: The fields w/h/width/height of the passed mp_image must be all set
|
|
* accordingly. Setting w and width or h and height to different values
|
|
* can be used to store snapshots of anamorphic video.
|
|
*/
|
|
int write_image(struct mp_image *image, const struct image_writer_opts *opts,
|
|
const char *filename, struct mp_log *log);
|
|
|
|
// Debugging helper.
|
|
void dump_png(struct mp_image *image, const char *filename, struct mp_log *log);
|