diff options
author | wm4 <wm4@nowhere> | 2015-12-09 00:22:12 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-12-09 00:23:36 +0100 |
commit | 45ae0716be3319bac4585b8fedac529a0809a44c (patch) | |
tree | 3d0c79a7d5e5bb8778118e9551295cedf9ed3667 /video/out | |
parent | c5c7b239b6386940a8063c6954db2a4705ce3251 (diff) | |
download | mpv-45ae0716be3319bac4585b8fedac529a0809a44c.tar.bz2 mpv-45ae0716be3319bac4585b8fedac529a0809a44c.tar.xz |
csputils: rename "yuv2rgb" functions
They're not necessarily restricted to YUV aka YCbCr.
vo_direct3d.c and demux_disc.c (DVD specific code) changes untested.
Diffstat (limited to 'video/out')
-rw-r--r-- | video/out/opengl/video.c | 2 | ||||
-rw-r--r-- | video/out/vo_direct3d.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c index 7ac56cb414..8b7ec35478 100644 --- a/video/out/opengl/video.c +++ b/video/out/opengl/video.c @@ -1491,7 +1491,7 @@ static void pass_convert_yuv(struct gl_video *p) // Conversion to RGB. For RGB itself, this still applies e.g. brightness // and contrast controls, or expansion of e.g. LSB-packed 10 bit data. struct mp_cmat m = {{{0}}}; - mp_get_yuv2rgb_coeffs(&cparams, &m); + mp_get_csp_matrix(&cparams, &m); gl_sc_uniform_mat3(sc, "colormatrix", true, &m.m[0][0]); gl_sc_uniform_vec3(sc, "colormatrix_c", m.c); diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c index 76c92ca339..f9a5cb092f 100644 --- a/video/out/vo_direct3d.c +++ b/video/out/vo_direct3d.c @@ -1205,7 +1205,7 @@ static void update_colorspace(d3d_priv *priv) csp.texture_bits = (csp.input_bits + 7) & ~7; struct mp_cmat coeff; - mp_get_yuv2rgb_coeffs(&csp, &coeff); + mp_get_csp_matrix(&csp, &coeff); for (int row = 0; row < 3; row++) { for (int col = 0; col < 3; col++) priv->d3d_colormatrix.m[row][col] = coeff.m[row][col]; |