From 51bb5e819469574f210dbdf916741511282956ce Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Tue, 31 Mar 2015 07:31:35 +0200 Subject: vo_opengl: make csp options consistent with vf_format --- video/out/gl_video.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'video') diff --git a/video/out/gl_video.c b/video/out/gl_video.c index 34defb1db1..e5320fc184 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -366,26 +366,8 @@ const struct m_sub_options gl_video_conf = { .opts = (const m_option_t[]) { OPT_FLOATRANGE("gamma", gamma, 0, 0.1, 2.0), OPT_FLAG("gamma-auto", gamma_auto, 0), - OPT_CHOICE("target-prim", target_prim, 0, - ({"auto", MP_CSP_PRIM_AUTO}, - {"bt601-525", MP_CSP_PRIM_BT_601_525}, - {"bt601-625", MP_CSP_PRIM_BT_601_625}, - {"bt709", MP_CSP_PRIM_BT_709}, - {"bt2020", MP_CSP_PRIM_BT_2020}, - {"bt470m", MP_CSP_PRIM_BT_470M}, - {"apple", MP_CSP_PRIM_APPLE}, - {"adobe", MP_CSP_PRIM_ADOBE}, - {"prophoto", MP_CSP_PRIM_PRO_PHOTO}, - {"cie1931", MP_CSP_PRIM_CIE_1931})), - OPT_CHOICE("target-trc", target_trc, 0, - ({"auto", MP_CSP_TRC_AUTO}, - {"bt1886", MP_CSP_TRC_BT_1886}, - {"srgb", MP_CSP_TRC_SRGB}, - {"linear", MP_CSP_TRC_LINEAR}, - {"gamma18", MP_CSP_TRC_GAMMA18}, - {"gamma22", MP_CSP_TRC_GAMMA22}, - {"gamma28", MP_CSP_TRC_GAMMA28}, - {"prophoto", MP_CSP_TRC_PRO_PHOTO})), + OPT_CHOICE_C("target-prim", target_prim, 0, mp_csp_prim_names), + OPT_CHOICE_C("target-trc", target_trc, 0, mp_csp_trc_names), OPT_FLAG("npot", npot, 0), OPT_FLAG("pbo", pbo, 0), OPT_STRING_VALIDATE("scale", scaler[0].kernel.name, 0, validate_scaler_opt), -- cgit v1.2.3