summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/audio_out/audio_alsa_out.c5
-rw-r--r--src/audio_out/audio_oss_out.c8
-rw-r--r--src/dxr3/dxr3_decode_video.c4
-rw-r--r--src/dxr3/video_out_dxr3.c4
-rw-r--r--src/input/input_dvd.c10
-rw-r--r--src/input/input_mms.c6
-rw-r--r--src/input/input_v4l.c4
-rw-r--r--src/input/librtsp/rtsp_session.c4
-rw-r--r--src/post/goom/xine_goom.c4
-rw-r--r--src/spu_dec/sputext_decoder.c4
-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
-rw-r--r--src/xine-engine/audio_out.c6
-rw-r--r--src/xine-engine/osd.c4
-rw-r--r--src/xine-engine/xine.c4
-rw-r--r--src/xine-utils/memcpy.c4
19 files changed, 51 insertions, 50 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index f35c51cb1..f8d4b9214 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2013 the xine project
+ * Copyright (C) 2000-2014 the xine project
*
* This file is part of xine, a free video player.
*
@@ -1488,7 +1488,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
/* for usability reasons, keep this in sync with audio_oss_out.c */
speakers = config->register_enum(config, "audio.output.speaker_arrangement", STEREO,
- speaker_arrangement,
+ (char **)speaker_arrangement,
AUDIO_DEVICE_SPEAKER_ARRANGEMENT_HELP,
0, alsa_speaker_arrangement_cb, this);
@@ -1694,3 +1694,4 @@ const plugin_info_t xine_plugin_info[] EXPORTED = {
{ PLUGIN_AUDIO_OUT, AO_OUT_ALSA_IFACE_VERSION, "alsa", XINE_VERSION_CODE, &ao_info_alsa, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
+
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index 3c9559433..0fdbaa705 100644
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_out.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2013 the xine project
+ * Copyright (C) 2000-2014 the xine project
*
* This file is part of xine, a free video player.
*
@@ -726,7 +726,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
/* devname_val is offset used to select auto, /dev/dsp, or /dev/sound/dsp */
devname_val = config->register_enum (config, "audio.device.oss_device_name", 0,
- devname_opts,
+ (char **)devname_opts,
_("OSS audio device name"),
_("Specifies the base part of the audio device name, "
"to which the OSS device number is appended to get the "
@@ -790,7 +790,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
*/
this->sync_method = config->register_enum (config, "audio.oss_sync_method", OSS_SYNC_AUTO_DETECT,
- sync_methods,
+ (char **)sync_methods,
_("a/v sync method to use by OSS"),
_("xine can use different methods to keep audio and video "
"synchronized. Which setting works best depends on the "
@@ -908,7 +908,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
/* for usability reasons, keep this in sync with audio_alsa_out.c */
speakers = config->register_enum(config, "audio.output.speaker_arrangement", STEREO,
- speaker_arrangement,
+ (char **)speaker_arrangement,
AUDIO_DEVICE_SPEAKER_ARRANGEMENT_HELP,
0, oss_speaker_arrangement_cb, this);
diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c
index 61fd503c7..200a4d77b 100644
--- a/src/dxr3/dxr3_decode_video.c
+++ b/src/dxr3/dxr3_decode_video.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2011 the xine project
+ * Copyright (C) 2000-2014 the xine project
*
* This file is part of xine, a free video player.
*
@@ -235,7 +235,7 @@ static video_decoder_t *dxr3_open_plugin(video_decoder_class_t *class_gen, xine_
}
this->use_panscan = cfg->register_enum(cfg,
- "dxr3.use_panscan", 0, panscan_types, _("use Pan & Scan info"),
+ "dxr3.use_panscan", 0, (char **)panscan_types, _("use Pan & Scan info"),
_("\"Pan & Scan\" is a special display mode which is sometimes used in MPEG "
"encoded material. You can specify here, how to handle such content.\n\n"
"only when forced\n"
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index 1944c1746..8b9b9ae36 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.c
@@ -366,7 +366,7 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v
dxr3_set_property(&this->vo_driver, VO_PROP_SATURATION, 500);
/* overlay or tvout? */
- confnum = config->register_enum(config, "dxr3.output.mode", 0, videoout_modes,
+ confnum = config->register_enum(config, "dxr3.output.mode", 0, (char **)videoout_modes,
_("video output mode (TV or overlay)"),
_("The way the DXR3 outputs the final video can be set here. The individual values are:\n\n"
"letterboxed tv\n"
@@ -440,7 +440,7 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v
}
/* init tvmode */
- confnum = config->register_enum(config, "dxr3.output.tvmode", 3, tv_modes,
+ confnum = config->register_enum(config, "dxr3.output.tvmode", 3, (char **)tv_modes,
_("preferred tv mode"), _("Selects the TV mode to be used by the DXR3. The values mean:\n\n"
"ntsc: NTSC at 60Hz\npal: PAL at 50Hz\npal60: PAL at 60Hz\ndefault: keep the card's setting"),
0, NULL, NULL);
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index a8d805fa4..69010ff3f 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2012 the xine project,
+ * Copyright (C) 2000-2014 the xine project,
* Rich Wareham <richwareham@users.sourceforge.net>
*
* This file is part of xine, a free video player.
@@ -1805,7 +1805,7 @@ static void *init_class (xine_t *xine, void *data) {
if (raw_device) xine_setenv("DVDCSS_RAW_DEVICE", raw_device, 0);
mode = config->register_enum(config, "media.dvd.css_decryption_method", 0,
- decrypt_modes, _("CSS decryption method"),
+ (char **)decrypt_modes, _("CSS decryption method"),
_("Selects the decryption method libdvdcss will use to descramble "
"copy protected DVDs. Try the various methods, if you have problems "
"playing scrambled DVDs."), 20, NULL, NULL);
@@ -1841,7 +1841,7 @@ static void *init_class (xine_t *xine, void *data) {
"of the DVD layer change on faster drives."),
10, read_ahead_cb, this);
config->register_enum(config, "media.dvd.skip_behaviour", 0,
- skip_modes,
+ (char **)skip_modes,
_("unit for the skip action"),
_("You can configure the behaviour when issuing a skip command (using the skip "
"buttons for example). The individual values mean:\n\n"
@@ -1857,7 +1857,7 @@ static void *init_class (xine_t *xine, void *data) {
"features on the DVD"),
20, NULL, NULL);
config->register_enum(config, "media.dvd.seek_behaviour", 0,
- seek_modes,
+ (char **)seek_modes,
_("unit for seeking"),
_("You can configure the domain spanned by the seek slider. The individual "
"values mean:\n\n"
@@ -1869,7 +1869,7 @@ static void *init_class (xine_t *xine, void *data) {
"a chapter of the current feature"),
20, seek_mode_cb, this);
config->register_enum(config, "media.dvd.play_single_chapter", 0,
- play_single_chapter_modes,
+ (char **)play_single_chapter_modes,
_("play mode when title/chapter is given"),
_("You can configure the behaviour when playing a dvd from a given "
"title/chapter (eg. using MRL 'dvd:/1.2'). The individual values mean:\n\n"
diff --git a/src/input/input_mms.c b/src/input/input_mms.c
index 66d85af65..a9462b50c 100644
--- a/src/input/input_mms.c
+++ b/src/input/input_mms.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2002-2009 the xine project
+ * Copyright (C) 2002-2014 the xine project
*
* This file is part of xine, a free video player.
*
@@ -471,7 +471,7 @@ static void *init_class (xine_t *xine, void *data) {
this->input_class.eject_media = NULL;
xine->config->register_enum(xine->config, "media.network.bandwidth", 10,
- mms_bandwidth_strs,
+ (char **)mms_bandwidth_strs,
_("network bandwidth"),
_("Specify the bandwidth of your internet connection here. "
"This will be used when streaming servers offer different versions "
@@ -481,7 +481,7 @@ static void *init_class (xine_t *xine, void *data) {
this->protocol = xine->config->register_enum(xine->config,
"media.network.mms_protocol",
0,
- mms_protocol_strs,
+ (char **)mms_protocol_strs,
_("MMS protocol"),
_("Select the protocol to encapsulate MMS.\nTCP is better but you may need HTTP behind a firewall."),
20,
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 79c7f34f8..a1e1d1233 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2011 the xine project
+ * Copyright (C) 2003-2014 the xine project
* Copyright (C) 2003 J.Asselman <j.asselman@itsec-ps.nl>
*
* This file is part of xine, a free video player.
@@ -1925,7 +1925,7 @@ static void *init_video_class (xine_t *xine, void *data)
10, NULL, NULL);
#endif
config->register_enum (config, "media.video4linux.tv_standard", 0 /* auto */,
- tv_standard_names, _("v4l TV standard"),
+ (char **)tv_standard_names, _("v4l TV standard"),
_("Selects the TV standard of the input signals. "
"Either: AUTO, PAL, NTSC or SECAM. "), 20, NULL, NULL);
diff --git a/src/input/librtsp/rtsp_session.c b/src/input/librtsp/rtsp_session.c
index 6571ab6b9..6ace06836 100644
--- a/src/input/librtsp/rtsp_session.c
+++ b/src/input/librtsp/rtsp_session.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2009 the xine project
+ * Copyright (C) 2000-2014 the xine project
*
* This file is part of xine, a free video player.
*
@@ -91,7 +91,7 @@ rtsp_session_t *rtsp_session_start(xine_stream_t *stream, char *mrl) {
uint32_t bandwidth;
bandwidth_id = xine->config->register_enum(xine->config, "media.network.bandwidth", 10,
- rtsp_bandwidth_strs,
+ (char **)rtsp_bandwidth_strs,
_("network bandwidth"),
_("Specify the bandwidth of your internet connection here. "
"This will be used when streaming servers offer different versions "
diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c
index b04eeddea..2b9a032ce 100644
--- a/src/post/goom/xine_goom.c
+++ b/src/post/goom/xine_goom.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.
*
@@ -233,7 +233,7 @@ static void *goom_init_plugin(xine_t *xine, void *data)
cfg->register_enum (cfg, "effects.goom.csc_method", 0,
- goom_csc_methods,
+ (char **)goom_csc_methods,
_("colour space conversion method"),
_("You can choose the colour space conversion method used by goom.\n"
"The available selections should be self-explaining."),
diff --git a/src/spu_dec/sputext_decoder.c b/src/spu_dec/sputext_decoder.c
index f52d31fa9..b9532e94e 100644
--- a/src/spu_dec/sputext_decoder.c
+++ b/src/spu_dec/sputext_decoder.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2013 the xine project
+ * Copyright (C) 2000-2014 the xine project
*
* This file is part of xine, a free video player.
*
@@ -1133,7 +1133,7 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) {
this->subtitle_size = xine->config->register_enum(xine->config,
"subtitles.separate.subtitle_size",
1,
- subtitle_size_strings,
+ (char **)subtitle_size_strings,
_("subtitle size"),
_("You can adjust the subtitle size here. The setting will "
"be evaluated relative to the window size."),
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);
}
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index ca8475898..afead93f9 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2013 the xine project
+ * Copyright (C) 2000-2014 the xine project
*
* This file is part of xine, a free video player.
*
@@ -2160,7 +2160,7 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver,
this->gap_tolerance = driver->get_gap_tolerance (this->driver);
this->av_sync_method_conf = config->register_enum(config, "audio.synchronization.av_sync_method", 0,
- av_sync_methods,
+ (char **)av_sync_methods,
_("method to sync audio and video"),
_("When playing audio and video, there are at least "
"two clocks involved: The system clock, to which "
@@ -2189,7 +2189,7 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver,
config->update_num(config,"audio.synchronization.av_sync_method",this->av_sync_method_conf);
this->resample_conf = config->register_enum (config, "audio.synchronization.resample_mode", 0,
- resample_modes,
+ (char **)resample_modes,
_("enable resampling"),
_("When the sample rate of the decoded audio does not "
"match the capabilities of your sound hardware, an "
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index b95f75891..ef88aefe7 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.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.
*
@@ -1886,7 +1886,7 @@ osd_renderer_t *_x_osd_renderer_init( xine_stream_t *stream ) {
this->textpalette = this->stream->xine->config->register_enum (this->stream->xine->config,
"ui.osd.text_palette", 0,
- textpalettes_str,
+ (char **)textpalettes_str,
_("palette (foreground-border-background) to use for subtitles and OSD"),
_("The palette for on-screen-display and some subtitle formats that do "
"not specify any colouring themselves. The palettes are listed in the "
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 84cfe214f..267aec498 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2013 the xine project
+ * Copyright (C) 2000-2014 the xine project
*
* This file is part of xine, a free video player.
*
@@ -1818,7 +1818,7 @@ void xine_init (xine_t *this) {
*/
this->demux_strategy = this->config->register_enum (
this->config, "engine.demux.strategy", 0,
- demux_strategies,
+ (char **)demux_strategies,
_("media format detection strategy"),
_("xine offers various methods to detect the media format of input to play. "
"The individual values are:\n\n"
diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c
index bd318bd5f..dd5ec71db 100644
--- a/src/xine-utils/memcpy.c
+++ b/src/xine-utils/memcpy.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001-2013 the xine project
+ * Copyright (C) 2001-2014 the xine project
*
* This file is part of xine, a free video player.
*
@@ -589,7 +589,7 @@ void xine_probe_fast_memcpy(xine_t *xine)
config_flags = xine_mm_accel();
best = xine->config->register_enum (xine->config, "engine.performance.memcpy_method", 0,
- memcpy_methods,
+ (char **)memcpy_methods,
_("memcopy method used by xine"),
_("The copying of large memory blocks is one of the most "
"expensive operations on todays computers. Therefore xine "