diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-04-08 16:33:35 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-04-08 16:33:35 +0100 |
| commit | 576c672a22a76a6d803da895845de47d20ec9dde (patch) | |
| tree | a7e71ac9e9b03ad8826b0fc5376c8286573f0726 /include | |
| parent | 17c987052ea86328f2dd27b52b3fc9518f500ad8 (diff) | |
| parent | 818165da93f72b8b32c164bcabb3eae2d4e4dc31 (diff) | |
| download | xine-lib-576c672a22a76a6d803da895845de47d20ec9dde.tar.gz xine-lib-576c672a22a76a6d803da895845de47d20ec9dde.tar.bz2 | |
Merge from 1.1.
--HG--
rename : include/xine.h.in => include/xine.h
rename : src/xine-engine/video_out.h => include/xine/video_out.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/xine.h | 1 | ||||
| -rw-r--r-- | include/xine/video_out.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/xine.h b/include/xine.h index 86220388d..0783cf117 100644 --- a/include/xine.h +++ b/include/xine.h @@ -336,6 +336,7 @@ int xine_get_param (xine_stream_t *stream, int param) XINE_PROTECTED; #define XINE_PARAM_VO_SATURATION 0x01000003 /* 0..65535 */ #define XINE_PARAM_VO_CONTRAST 0x01000004 /* 0..65535 */ #define XINE_PARAM_VO_BRIGHTNESS 0x01000005 /* 0..65535 */ +#define XINE_PARAM_VO_GAMMA 0x0100000c /* 0..65535 */ #define XINE_PARAM_VO_ZOOM_X 0x01000008 /* percent */ #define XINE_PARAM_VO_ZOOM_Y 0x0100000d /* percent */ #define XINE_PARAM_VO_PAN_SCAN 0x01000009 /* bool */ diff --git a/include/xine/video_out.h b/include/xine/video_out.h index dff1895af..42fcae99f 100644 --- a/include/xine/video_out.h +++ b/include/xine/video_out.h @@ -248,6 +248,7 @@ struct xine_video_port_s { #define VO_PROP_PAN_SCAN 9 #define VO_PROP_TVMODE 10 #define VO_PROP_MAX_NUM_FRAMES 11 +#define VO_PROP_GAMMA 12 #define VO_PROP_ZOOM_Y 13 #define VO_PROP_DISCARD_FRAMES 14 /* not used by drivers */ #define VO_PROP_WINDOW_WIDTH 15 /* read-only */ @@ -307,6 +308,7 @@ struct xine_video_port_s { #define VO_CAP_CUSTOM_EXTENT_OVERLAY 0x01000000 /* driver can blend custom extent overlay to output extent */ #define VO_CAP_ARGB_LAYER_OVERLAY 0x02000000 /* driver supports true color overlay */ #define VO_CAP_VIDEO_WINDOW_OVERLAY 0x04000000 /* driver can scale video to an area within overlay */ +#define VO_CAP_GAMMA 0x00080000 /* |