summaryrefslogtreecommitdiff
path: root/src/video_out
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_out')
-rw-r--r--src/video_out/video_out_opengl.c4
-rw-r--r--src/video_out/video_out_vdpau.c8
-rw-r--r--src/video_out/video_out_xcbxv.c6
-rw-r--r--src/video_out/video_out_xv.c6
-rw-r--r--src/video_out/video_out_xxmc.c6
5 files changed, 15 insertions, 15 deletions
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c
index 56bab1369..093630605 100644
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2012 the xine project
+ * Copyright (C) 2000-2014 the xine project
*
* This file is part of xine, a free video player.
*
@@ -1977,7 +1977,7 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen, const v
render_fun_names[i] = opengl_rb[i].name;
render_fun_names[i] = NULL;
this->render_fun_id = config->register_enum (config, "video.output.opengl_renderer",
- 0, render_fun_names,
+ 0, (char **)render_fun_names,
_("OpenGL renderer"),
_("The OpenGL plugin provides several render modules:\n\n"
"2D_Tex_Fragprog\n"
diff --git a/src/video_out/video_out_vdpau.c b/src/video_out/video_out_vdpau.c
index aa6fb951e..51a2346c5 100644
--- a/src/video_out/video_out_vdpau.c
+++ b/src/video_out/video_out_vdpau.c
@@ -1,6 +1,6 @@
/*
* kate: space-indent on; indent-width 2; mixedindent off; indent-mode cstyle; remove-trailing-space on;
- * Copyright (C) 2008-2013 the xine project
+ * Copyright (C) 2008-2014 the xine project
* Copyright (C) 2008 Christophe Thommeret <hftom@free.fr>
*
* This file is part of xine, a free video player.
@@ -3111,12 +3111,12 @@ static vo_driver_t *vdpau_open_plugin (video_driver_class_t *class_gen, const vo
}
this->deinterlace_method_hd = config->register_enum( config, "video.output.vdpau_hd_deinterlace_method", deint_default,
- this->deinterlacers_name, _("vdpau: HD deinterlace method"),
+ (char **)this->deinterlacers_name, _("vdpau: HD deinterlace method"),
deinterlacers_description,
10, vdpau_update_deinterlace_method_hd, this );
this->deinterlace_method_sd = config->register_enum( config, "video.output.vdpau_sd_deinterlace_method", deint_default,
- this->deinterlacers_name, _("vdpau: SD deinterlace method"),
+ (char **)this->deinterlacers_name, _("vdpau: SD deinterlace method"),
deinterlacers_description,
10, vdpau_update_deinterlace_method_sd, this );
@@ -3148,7 +3148,7 @@ static vo_driver_t *vdpau_open_plugin (video_driver_class_t *class_gen, const vo
10, vdpau_set_background, this );
}
- this->sd_only_properties = config->register_enum( config, "video.output.vdpau_sd_only_properties", 0, vdpau_sd_only_properties,
+ this->sd_only_properties = config->register_enum( config, "video.output.vdpau_sd_only_properties", 0, (char **)vdpau_sd_only_properties,
_("vdpau: restrict enabling video properties for SD video only"),
_("none\n"
"No restrictions\n\n"
diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c
index 6ff4b7b73..82953e57f 100644
--- a/src/video_out/video_out_xcbxv.c
+++ b/src/video_out/video_out_xcbxv.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2012 the xine project
+ * Copyright (C) 2000-2014 the xine project
*
* This file is part of xine, a free video player.
*
@@ -1324,7 +1324,7 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
VIDEO_DEVICE_XV_PORT_HELP,
20, NULL, NULL);
prefer_type = config->register_enum (config, "video.device.xv_preferred_method", 0,
- prefer_labels, VIDEO_DEVICE_XV_PREFER_TYPE_HELP,
+ (char **)prefer_labels, VIDEO_DEVICE_XV_PREFER_TYPE_HELP,
10, NULL, NULL);
if (xv_port != 0) {
@@ -1531,7 +1531,7 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
} else if(!strcmp(name, "XV_BICUBIC")) {
int xv_bicubic =
config->register_enum (config, "video.device.xv_bicubic", 2,
- bicubic_types, VIDEO_DEVICE_XV_BICUBIC_HELP,
+ (char **)bicubic_types, VIDEO_DEVICE_XV_BICUBIC_HELP,
20, xv_update_XV_BICUBIC, this);
config->update_num(config,"video.device.xv_bicubic",xv_bicubic);
}
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index e9d3cffca..24c25993b 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2012 the xine project
+ * Copyright (C) 2000-2014 the xine project
*
* This file is part of xine, a free video player.
*
@@ -1370,7 +1370,7 @@ static vo_driver_t *open_plugin_2 (video_driver_class_t *class_gen, const void *
VIDEO_DEVICE_XV_PORT_HELP,
20, NULL, NULL);
prefer_type = config->register_enum (config, "video.device.xv_preferred_method", 0,
- prefer_labels, VIDEO_DEVICE_XV_PREFER_TYPE_HELP,
+ (char **)prefer_labels, VIDEO_DEVICE_XV_PREFER_TYPE_HELP,
10, NULL, NULL);
if (xv_port != 0) {
@@ -1569,7 +1569,7 @@ static vo_driver_t *open_plugin_2 (video_driver_class_t *class_gen, const void *
} else if(!strcmp(name, "XV_BICUBIC")) {
int xv_bicubic =
config->register_enum (config, "video.device.xv_bicubic", 2,
- bicubic_types, VIDEO_DEVICE_XV_BICUBIC_HELP,
+ (char **)bicubic_types, VIDEO_DEVICE_XV_BICUBIC_HELP,
20, xv_update_XV_BICUBIC, this);
config->update_num(config,"video.device.xv_bicubic",xv_bicubic);
}
diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c
index 32097dc65..8751d1295 100644
--- a/src/video_out/video_out_xxmc.c
+++ b/src/video_out/video_out_xxmc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2012 the xine project
+ * Copyright (C) 2000-2014 the xine project
* Copyright (C) 2004 the Unichrome project
*
* This file is part of xine, a free video player.
@@ -2496,7 +2496,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
VIDEO_DEVICE_XV_PORT_HELP,
20, NULL, NULL);
prefer_type = config->register_enum (config, "video.device.xv_preferred_method", 0,
- prefer_labels, VIDEO_DEVICE_XV_PREFER_TYPE_HELP,
+ (char **)prefer_labels, VIDEO_DEVICE_XV_PREFER_TYPE_HELP,
10, NULL, NULL);
if (xv_port != 0) {
@@ -2667,7 +2667,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
} else if(!strcmp(name, "XV_BICUBIC")) {
int xv_bicubic =
config->register_enum (config, "video.device.xv_bicubic", 2,
- bicubic_types, VIDEO_DEVICE_XV_BICUBIC_HELP,
+ (char **)bicubic_types, VIDEO_DEVICE_XV_BICUBIC_HELP,
20, xxmc_update_XV_BICUBIC, this);
config->update_num(config,"video.device.xv_bicubic",xv_bicubic);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-03 09:44:09 +0000