summaryrefslogtreecommitdiff
path: root/include/xine
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2010-04-08 16:33:35 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2010-04-08 16:33:35 +0100
commit576c672a22a76a6d803da895845de47d20ec9dde (patch)
treea7e71ac9e9b03ad8826b0fc5376c8286573f0726 /include/xine
parent17c987052ea86328f2dd27b52b3fc9518f500ad8 (diff)
parent818165da93f72b8b32c164bcabb3eae2d4e4dc31 (diff)
downloadxine-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/xine')
-rw-r--r--include/xine/video_out.h2
1 files changed, 2 insertions, 0 deletions
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
/*