diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-03-25 21:18:34 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-03-25 21:18:34 +0000 |
| commit | f60258a680d9d555203654800ad0c88e2e679213 (patch) | |
| tree | e93ed258184aa320b5082dfccefa31584d8bd31f /src | |
| parent | f62eed3209aab6fc642e66b18cc71d526517aadb (diff) | |
| parent | 7b0c3fd46c12613ffcc987183ffe13205bbbef82 (diff) | |
| download | xine-lib-f60258a680d9d555203654800ad0c88e2e679213.tar.gz xine-lib-f60258a680d9d555203654800ad0c88e2e679213.tar.bz2 | |
Merge from 1.1; adapt dh_xine for 1.2.
Diffstat (limited to 'src')
| -rw-r--r-- | src/demuxers/demux_mod.c | 15 | ||||
| -rw-r--r-- | src/dxr3/video_out_dxr3.c | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/demuxers/demux_mod.c b/src/demuxers/demux_mod.c index fbb20dca3..e8199be0e 100644 --- a/src/demuxers/demux_mod.c +++ b/src/demuxers/demux_mod.c @@ -357,7 +357,20 @@ static void *demux_mod_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("ModPlug Amiga MOD Music file demux plugin"); this->demux_class.identifier = "mod"; - this->demux_class.mimetypes = NULL; + this->demux_class.mimetypes = + "audio/x-mod: mod: SoundTracker/NoiseTracker/ProTracker Module;" + "audio/mod: mod: SoundTracker/NoiseTracker/ProTracker Module;" + "audio/it: it: ImpulseTracker Module;" + "audio/x-it: it: ImpulseTracker Module;" + "audio/x-stm: stm: ScreamTracker 2 Module;" + "audio/x-s3m: s3m: ScreamTracker 3 Module;" + "audio/s3m: s3m: ScreamTracker 3 Module;" + "application/playerpro: 669: 669 Tracker Module;" + "application/adrift; amf: ADRIFT Module File;" + "audio/med; med; Amiga MED/OctaMED Tracker Module Sound File;" + "audio/x-amf; amf: ADRIFT Module File;" + "audio/x-xm; xm: FastTracker II Audio;" + "audio/xm; xm: FastTracker II Audio;"; this->demux_class.extensions = "mod it stm s3m 669 amf med mdl xm"; this->demux_class.dispose = default_demux_class_dispose; diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index df754c97f..71defc285 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.c @@ -21,7 +21,7 @@ /* mpeg1 encoding video out plugin for the dxr3. * * modifications to the original dxr3 video out plugin by - * Mike Lampard <mike at web2u.com.au> + * Mike Lampard <mlampard at users.sourceforge.net> * this first standalone version by * Harm van der Heijden <hrm at users.sourceforge.net> */ |