diff options
author | wm4 <wm4@nowhere> | 2016-06-03 20:06:29 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-06-03 20:06:29 +0200 |
commit | 2179879172be97541ceffdd7d29cba09c1ca9629 (patch) | |
tree | 4ad51cbb5e266af3fe163eb29ac0ea424e60a9ef /video/out | |
parent | 2d76c145c35955c827e401b86d1f55fd9fa8d893 (diff) |
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).
Diffstat (limited to 'video/out')
-rw-r--r-- | video/out/opengl/lcms.c | 3 | ||||
-rw-r--r-- | video/out/opengl/lcms.h | 6 | ||||
-rw-r--r-- | video/out/opengl/video.h | 5 |
3 files changed, 6 insertions, 8 deletions
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]; |