diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 01:05:30 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 01:05:30 +0200 |
commit | 231b33a02fae95b260120349040106bfa34a3750 (patch) | |
tree | 23c4de0e6263b2d99966348d7003177b3b3e3740 /libvo/gl_common.h | |
parent | 52126e574c7872ca95e7974cfe5445421b74f24c (diff) | |
parent | 92cd6dc3e916ae4275ff05d2b238fc778cfbfc6b (diff) | |
download | mpv-231b33a02fae95b260120349040106bfa34a3750.tar.bz2 mpv-231b33a02fae95b260120349040106bfa34a3750.tar.xz |
Merge svn changes up to r30165
Diffstat (limited to 'libvo/gl_common.h')
-rw-r--r-- | libvo/gl_common.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libvo/gl_common.h b/libvo/gl_common.h index e556718ec0..db20ebbc65 100644 --- a/libvo/gl_common.h +++ b/libvo/gl_common.h @@ -26,6 +26,7 @@ #include "mp_msg.h" #include "video_out.h" +#include "csputils.h" #ifdef CONFIG_GL_WIN32 #include <windows.h> @@ -329,18 +330,15 @@ int loadGPUProgram(GLenum target, char *prog); //! extract chrominance scaler out of type #define YUV_CHROM_SCALER(t) ((t >> YUV_CHROM_SCALER_SHIFT) & YUV_SCALER_MASK) /** \} */ + typedef struct { GLenum target; int type; - float brightness; - float contrast; - float hue; - float saturation; - float rgamma; - float ggamma; - float bgamma; + struct mp_csp_params csp_params; int texw; int texh; + int chrom_texw; + int chrom_texh; float filter_strength; } gl_conversion_params_t; |