summaryrefslogtreecommitdiffstats
path: root/video/csputils.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-03-12 23:21:21 +0100
committerwm4 <wm4@nowhere>2015-03-12 23:21:21 +0100
commit73cf6155557abb27917371ec7d4f87f5fefb961f (patch)
tree382713c02863c460e5c9b4007bf4bf8b4d89e49e /video/csputils.c
parentae6019cbc98cfad2613e89a80bee79ce6b2f1319 (diff)
parent3974a5ca5e55ce00e8177a672e0627bfabee4118 (diff)
downloadmpv-73cf6155557abb27917371ec7d4f87f5fefb961f.tar.bz2
mpv-73cf6155557abb27917371ec7d4f87f5fefb961f.tar.xz
Merge branch 'gl_rework'
Diffstat (limited to 'video/csputils.c')
-rw-r--r--video/csputils.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/video/csputils.c b/video/csputils.c
index cee33dbba9..06de4bb9e8 100644
--- a/video/csputils.c
+++ b/video/csputils.c
@@ -70,6 +70,7 @@ const char *const mp_csp_trc_names[MP_CSP_TRC_COUNT] = {
"BT.1886 (SD, HD, UHD)",
"sRGB (IEC 61966-2-1)",
"Linear light",
+ "Pure power (gamma 2.2)",
};
const char *const mp_csp_equalizer_names[MP_CSP_EQ_COUNT] = {
@@ -156,6 +157,7 @@ enum mp_csp_trc avcol_trc_to_mp_csp_trc(int avtrc)
case AVCOL_TRC_BT2020_12: return MP_CSP_TRC_BT_1886;
case AVCOL_TRC_IEC61966_2_1: return MP_CSP_TRC_SRGB;
case AVCOL_TRC_LINEAR: return MP_CSP_TRC_LINEAR;
+ case AVCOL_TRC_GAMMA22: return MP_CSP_TRC_GAMMA22;
default: return MP_CSP_TRC_AUTO;
}
}
@@ -202,6 +204,7 @@ int mp_csp_trc_to_avcol_trc(enum mp_csp_trc trc)
case MP_CSP_TRC_BT_1886: return AVCOL_TRC_BT709;
case MP_CSP_TRC_SRGB: return AVCOL_TRC_IEC61966_2_1;
case MP_CSP_TRC_LINEAR: return AVCOL_TRC_LINEAR;
+ case MP_CSP_TRC_GAMMA22: return AVCOL_TRC_GAMMA22;
default: return AVCOL_TRC_UNSPECIFIED;
}
}