summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-engine')
-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
3 files changed, 7 insertions, 7 deletions
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"