diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-02 17:25:49 +0100 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-02 17:25:49 +0100 |
commit | de706f4f3630a8b306b15b042c5c585d5922ce1f (patch) | |
tree | 0be77f8650674dde4caf832e33102fe9d641ac6e /src/combined | |
parent | 09b03f1bb372bb18b7bf30529ec82c7325545c39 (diff) | |
parent | a50219269aa4522530de7b7a26bc4e95a5cda1dd (diff) | |
download | xine-lib-de706f4f3630a8b306b15b042c5c585d5922ce1f.tar.gz xine-lib-de706f4f3630a8b306b15b042c5c585d5922ce1f.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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c index 403d136d1..e32c17e4e 100644 --- a/src/combined/wavpack_demuxer.c +++ b/src/combined/wavpack_demuxer.c @@ -368,8 +368,8 @@ 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 = "audio/x-wavpack"; - this->demux_class.extensions = "wv"; + this->demux_class.mimetypes = "audio/x-wavpack: wv,wvp: WavPack audio;"; + this->demux_class.extensions = "wv wvp"; this->demux_class.dispose = default_demux_class_dispose; return this; |