diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-02-14 22:26:28 +0200 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-02-14 22:26:28 +0200 |
| commit | c7b56e4119bc8870fc4f35ac38159414cfe54ff1 (patch) | |
| tree | daa4a41dde50a45b5a14a98bd8c4a231a6345a94 /src/video_out/video_out_vidix.c | |
| parent | 428214feb6e7f8ac24e64d9c6d8fbd5382bf539a (diff) | |
| parent | 8104053a5d71f7ca8c673469d81fc961542e7560 (diff) | |
| download | xine-lib-c7b56e4119bc8870fc4f35ac38159414cfe54ff1.tar.gz xine-lib-c7b56e4119bc8870fc4f35ac38159414cfe54ff1.tar.bz2 | |
Merge from 1.1
--HG--
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
Diffstat (limited to 'src/video_out/video_out_vidix.c')
| -rw-r--r-- | src/video_out/video_out_vidix.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index 41406fb58..81ae8e01a 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.c @@ -697,6 +697,8 @@ static int vidix_get_property (vo_driver_t *this_gen, int property) { vidix_driver_t *this = (vidix_driver_t *) this_gen; + if ((property < 0) || (property >= VO_NUM_PROPERTIES)) return 0; + switch (property) { case VO_PROP_WINDOW_WIDTH: this->props[property].value = this->sc.gui_width; @@ -731,6 +733,8 @@ static int vidix_set_property (vo_driver_t *this_gen, vidix_driver_t *this = (vidix_driver_t *) this_gen; int err; + if ((property < 0) || (property >= VO_NUM_PROPERTIES)) return 0; + if ((value >= this->props[property].min) && (value <= this->props[property].max)) { @@ -853,6 +857,10 @@ static void vidix_get_property_min_max (vo_driver_t *this_gen, vidix_driver_t *this = (vidix_driver_t *) this_gen; + if ((property < 0) || (property >= VO_NUM_PROPERTIES)) { + *min = *max = 0; + return; + } *min = this->props[property].min; *max = this->props[property].max; } |