summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2007-04-14 17:19:44 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2007-04-14 17:19:44 +0100
commit2339bb34dc3fcc155a04abda51df9fa00732df93 (patch)
tree1832d05244d55417fb3505263af74c238ec3c2a2 /src/xine-engine
parent1860c0e221f617406df80b0d35d22462dbcb9055 (diff)
parentdc36f8d045cf4f723c44766f44c92e1810e37f4f (diff)
downloadxine-lib-2339bb34dc3fcc155a04abda51df9fa00732df93.tar.gz
xine-lib-2339bb34dc3fcc155a04abda51df9fa00732df93.tar.bz2
Merge changes.
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/xine.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 402aaec66..6661ea102 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -1539,8 +1539,8 @@ static void config_save_cb (void *this_gen, xine_cfg_entry_t *entry) {
}
void xine_init (xine_t *this) {
- static const char *demux_strategies[] = {"default", "reverse", "content",
- "extension", NULL};
+ static const char *const demux_strategies[] = {"default", "reverse", "content",
+ "extension", NULL};
/* First of all, initialise libxdg-basedir as it's used by plugins. */
this->basedir_handle = xdgAllocHandle();