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/video_out | |
| 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/video_out')
| -rw-r--r-- | src/video_out/video_out_xcbxv.c | 5 | ||||
| -rw-r--r-- | src/video_out/video_out_xv.c | 5 | ||||
| -rw-r--r-- | src/video_out/video_out_xvmc.c | 5 | ||||
| -rw-r--r-- | src/video_out/video_out_xxmc.c | 7 |
4 files changed, 22 insertions, 0 deletions
diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c index 15b14c791..81a799dca 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -1340,6 +1340,11 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis xv_check_capability (this, VO_PROP_CONTRAST, attribute_it.data, adaptor_it.data->base_id, NULL, NULL, NULL); + } else if(!strcmp(name, "XV_GAMMA")) { + this->capabilities |= VO_CAP_GAMMA; + xv_check_capability (this, VO_PROP_GAMMA, attribute_it.data, + adaptor_it.data->base_id, + NULL, NULL, NULL); } else if(!strcmp(name, "XV_COLORKEY")) { this->capabilities |= VO_CAP_COLORKEY; xv_check_capability (this, VO_PROP_COLORKEY, attribute_it.data, diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index bca1b97f7..5c994c351 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -1390,6 +1390,11 @@ static vo_driver_t *open_plugin_2 (video_driver_class_t *class_gen, const void * xv_check_capability (this, VO_PROP_CONTRAST, attr[k], adaptor_info[adaptor_num].base_id, NULL, NULL, NULL); + } else if(!strcmp(name, "XV_GAMMA")) { + this->capabilities |= VO_CAP_GAMMA; + xv_check_capability (this, VO_PROP_GAMMA, attr[k], + adaptor_info[adaptor_num].base_id, + NULL, NULL, NULL); } else if(!strcmp(name, "XV_COLORKEY")) { this->capabilities |= VO_CAP_COLORKEY; xv_check_capability (this, VO_PROP_COLORKEY, attr[k], diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c index 79fea9ce5..7a0535818 100644 --- a/src/video_out/video_out_xvmc.c +++ b/src/video_out/video_out_xvmc.c @@ -1424,6 +1424,11 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi xvmc_check_capability (this, VO_PROP_CONTRAST, attr[k], adaptor_info[adaptor_num].base_id, NULL, NULL, NULL); + } else if(!strcmp(name, "XV_GAMMA")) { + this->capabilities |= VO_CAP_GAMMA; + xvmc_check_capability (this, VO_PROP_GAMMA, attr[k], + adaptor_info[adaptor_num].base_id, + NULL, NULL, NULL); } else if(!strcmp(name, "XV_COLORKEY")) { this->capabilities |= VO_CAP_COLORKEY; xvmc_check_capability (this, VO_PROP_COLORKEY, attr[k], diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c index 5f131855f..aa47eb2ae 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.c @@ -2619,6 +2619,13 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi xxmc_check_capability (this, VO_PROP_CONTRAST, attr[k], adaptor_info[adaptor_num].base_id, NULL, NULL, NULL); + + } else if(!strcmp(name, "XV_GAMMA")) { + this->capabilities |= VO_CAP_GAMMA; + xxmc_check_capability (this, VO_PROP_GAMMA, attr[k], + adaptor_info[adaptor_num].base_id, + NULL, NULL, NULL); + } else if(!strcmp(name, "XV_COLORKEY")) { this->capabilities |= VO_CAP_COLORKEY; xxmc_check_capability (this, VO_PROP_COLORKEY, attr[k], |