summaryrefslogtreecommitdiff
path: root/src/combined
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-02-29 14:59:25 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-02-29 14:59:25 +0000
commitfc9ff87cf9b7753a1622339b4dd3e4ea286f05e7 (patch)
tree71c6249433ccb247678affe99d44137a6ec204e8 /src/combined
parent4a2a24dc98003e59ea9d7da982fefc81a82890d2 (diff)
parent2e5c9c79a47efe0df60aaea17569ea9f32d347a6 (diff)
downloadxine-lib-fc9ff87cf9b7753a1622339b4dd3e4ea286f05e7.tar.gz
xine-lib-fc9ff87cf9b7753a1622339b4dd3e4ea286f05e7.tar.bz2
Merge from 1.1.
--HG-- rename : src/combined/demux_wavpack.c => src/combined/wavpack_demuxer.c
Diffstat (limited to 'src/combined')
-rw-r--r--src/combined/wavpack_demuxer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c
index 9c0831cfa..403d136d1 100644
--- a/src/combined/wavpack_demuxer.c
+++ b/src/combined/wavpack_demuxer.c
@@ -368,7 +368,7 @@ void *demux_wv_init_plugin (xine_t *const xine, void *const data) {
this->demux_class.open_plugin = open_plugin;
this->demux_class.description = N_("Wavpack demux plugin");
this->demux_class.identifier = "Wavpack";
- this->demux_class.mimetypes = NULL;
+ this->demux_class.mimetypes = "audio/x-wavpack";
this->demux_class.extensions = "wv";
this->demux_class.dispose = default_demux_class_dispose;