From 2179879172be97541ceffdd7d29cba09c1ca9629 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 3 Jun 2016 20:06:29 +0200
Subject: vo_opengl: move struct lut3d definition

This was dumb. Also, lcms.h has actually no need to include video.h
besides this and csputils.h (makes it slightly less entangled).
---
 video/out/opengl/lcms.c  | 3 +--
 video/out/opengl/lcms.h  | 6 +++++-
 video/out/opengl/video.h | 5 -----
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'video')

diff --git a/video/out/opengl/lcms.c b/video/out/opengl/lcms.c
index 62ac06de8b..7dc1b63220 100644
--- a/video/out/opengl/lcms.c
+++ b/video/out/opengl/lcms.c
@@ -28,8 +28,7 @@
 #include "common/msg.h"
 #include "options/m_option.h"
 #include "options/path.h"
-
-#include "video.h"
+#include "video/csputils.h"
 #include "lcms.h"
 
 #include "osdep/io.h"
diff --git a/video/out/opengl/lcms.h b/video/out/opengl/lcms.h
index 4e0a18c3d2..373a8b8669 100644
--- a/video/out/opengl/lcms.h
+++ b/video/out/opengl/lcms.h
@@ -16,7 +16,11 @@ struct mp_icc_opts {
     int contrast;
 };
 
-struct lut3d;
+struct lut3d {
+    uint16_t *data;
+    int size[3];
+};
+
 struct mp_log;
 struct mpv_global;
 struct gl_lcms;
diff --git a/video/out/opengl/video.h b/video/out/opengl/video.h
index a4a9fb703b..026d18526d 100644
--- a/video/out/opengl/video.h
+++ b/video/out/opengl/video.h
@@ -35,11 +35,6 @@
 #define TEXUNIT_3DLUT    (TEXUNIT_SCALERS+SCALER_COUNT)
 #define TEXUNIT_DITHER   (TEXUNIT_3DLUT+1)
 
-struct lut3d {
-    uint16_t *data;
-    int size[3];
-};
-
 struct scaler_fun {
     char *name;
     float params[2];
-- 
cgit v1.2.3