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 /src/xine-engine | |
| 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 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/video_out.c | 5 | ||||
| -rw-r--r-- | src/xine-engine/xine_interface.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c index e4af36e3c..4372226ad 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.c @@ -1471,7 +1471,9 @@ static int vo_get_property (xine_video_port_t *this_gen, int property) { case XINE_PARAM_VO_HUE: case XINE_PARAM_VO_SATURATION: case XINE_PARAM_VO_CONTRAST: - case XINE_PARAM_VO_BRIGHTNESS: { + case XINE_PARAM_VO_BRIGHTNESS: + case XINE_PARAM_VO_GAMMA: + { int v, min_v, max_v, range_v; pthread_mutex_lock( &this->driver_lock ); @@ -1566,6 +1568,7 @@ static int vo_set_property (xine_video_port_t *this_gen, int property, int value case XINE_PARAM_VO_SATURATION: case XINE_PARAM_VO_CONTRAST: case XINE_PARAM_VO_BRIGHTNESS: + case XINE_PARAM_VO_GAMMA: if (!this->grab_only) { int v, min_v, max_v, range_v; diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c index 87775c470..ab1bafa1e 100644 --- a/src/xine-engine/xine_interface.c +++ b/src/xine-engine/xine_interface.c @@ -471,6 +471,7 @@ void xine_set_param (xine_stream_t *stream, int param, int value) { case XINE_PARAM_VO_SATURATION: case XINE_PARAM_VO_CONTRAST: case XINE_PARAM_VO_BRIGHTNESS: + case XINE_PARAM_VO_GAMMA: case XINE_PARAM_VO_DEINTERLACE: case XINE_PARAM_VO_ASPECT_RATIO: case XINE_PARAM_VO_ZOOM_X: @@ -637,6 +638,7 @@ int xine_get_param (xine_stream_t *stream, int param) { case XINE_PARAM_VO_SATURATION: case XINE_PARAM_VO_CONTRAST: case XINE_PARAM_VO_BRIGHTNESS: + case XINE_PARAM_VO_GAMMA: case XINE_PARAM_VO_DEINTERLACE: case XINE_PARAM_VO_ASPECT_RATIO: case XINE_PARAM_VO_ZOOM_X: |