Revert recent vo_opengl related commits

Breaks vo_opengl by default. I'm hot able to fix this myself, because I
have no clue about the overcomplicated color management logic. Also,
whilethis is apparently caused by commit fbacd5, the following commits
all depend on it, so revert them too.

This reverts the following commits:
 e141caa97dade07f4d7e0d6c208bcd3493e712ed
 653b0dd5295453d9661f673b4ebd02c5ceacf645
 729c8b3f641e633474be612e66388c131a1b5c92
 fbacd5de31de964f7cd562304ab1c9b4a0d76015

Fixes #1636.

1 files changed, 4 insertions, 12 deletions

diff --git a/video/csputils.h b/video/csputils.h
index a082682e43..b6d17c1815 100644
--- a/video/csputils.h
+++ b/video/csputils.h
@@ -68,19 +68,15 @@ enum mp_csp_prim {
     MP_CSP_PRIM_COUNT
 };
 
-// Any enum mp_csp_prim value is a valid index (except MP_CSP_PRIM_COUNT)
-extern const char *const mp_csp_prim_names[MP_CSP_PRIM_COUNT];
-
 enum mp_csp_trc {
-    MP_CSP_TRC_AUTO,
+    MP_CSP_TRC_NONE,
     MP_CSP_TRC_BT_1886,
     MP_CSP_TRC_SRGB,
-    MP_CSP_TRC_LINEAR,
-    MP_CSP_TRC_COUNT
+    MP_CSP_TRC_LINEAR
 };
 
-// Any enum mp_csp_trc value is a valid index (except MP_CSP_TRC_COUNT)
-extern const char *const mp_csp_trc_names[MP_CSP_TRC_COUNT];
+// Any enum mp_csp_prim value is a valid index (except MP_CSP_PRIM_COUNT)
+extern const char *const mp_csp_prim_names[MP_CSP_PRIM_COUNT];
 
 // These constants are based on the ICC specification (Table 23) and match
 // up with the API of LittleCMS, which treats them as integers.
@@ -203,16 +199,12 @@ enum mp_csp_levels avcol_range_to_mp_csp_levels(int avrange);
 
 enum mp_csp_prim avcol_pri_to_mp_csp_prim(int avpri);
 
-enum mp_csp_trc avcol_trc_to_mp_csp_trc(int avtrc);
-
 int mp_csp_to_avcol_spc(enum mp_csp colorspace);
 
 int mp_csp_levels_to_avcol_range(enum mp_csp_levels range);
 
 int mp_csp_prim_to_avcol_pri(enum mp_csp_prim prim);
 
-int mp_csp_trc_to_avcol_trc(enum mp_csp_trc trc);
-
 enum mp_csp mp_csp_guess_colorspace(int width, int height);
 enum mp_csp_prim mp_csp_guess_primaries(int width, int height);