diff options
| author | wm4 <wm4@mplayer2.org> | 2012-03-16 18:57:23 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-03-16 19:14:44 +0100 |
| commit | 6de8120822c2dd9c50ef23b4977421651396f1ae (patch) | |
| tree | 11a977608cfc9f50cffbce4a879dd8e9b33b029c /libvo/csputils.h | |
| parent | 0eb21226cbfdd200f2aea5d3a9db2cdbff4773a5 (diff) | |
| parent | a8168102668337f3c11619bea7e744fc245adff1 (diff) | |
| download | mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.bz2 mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.xz | |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
command.c
mp_core.h
mplayer.c
screenshot.c
Diffstat (limited to 'libvo/csputils.h')
| -rw-r--r-- | libvo/csputils.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libvo/csputils.h b/libvo/csputils.h index 3a754a8273..434be4a9a1 100644 --- a/libvo/csputils.h +++ b/libvo/csputils.h @@ -68,7 +68,8 @@ struct mp_csp_params { float rgamma; float ggamma; float bgamma; - int input_shift; + int texture_bits; + int input_bits; }; enum mp_csp_equalizer_param { |