diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-26 23:31:00 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-26 23:31:00 +0000 |
| commit | d1a21fe364dacddf08c9391a5f8866034cf9ebd2 (patch) | |
| tree | 7e7792582d64d50f6455ed1e94d14b8b04dac774 /src/combined | |
| parent | d9e8c92bbc90bc0c2d8a4b71059936176bf2d6d0 (diff) | |
| parent | 082345c5b57e53633def3900b84d2a99974e8ac1 (diff) | |
| download | xine-lib-d1a21fe364dacddf08c9391a5f8866034cf9ebd2.tar.gz xine-lib-d1a21fe364dacddf08c9391a5f8866034cf9ebd2.tar.bz2 | |
Merge from 1.1.
--HG--
rename : po/libxine1.pot => po/libxine2.pot
rename : src/combined/demux_flac.c => src/combined/flac_demuxer.c
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
Diffstat (limited to 'src/combined')
| -rw-r--r-- | src/combined/flac_demuxer.c | 3 | ||||
| -rw-r--r-- | src/combined/xine_ogg_demuxer.c | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c index bab42876c..22ee2319b 100644 --- a/src/combined/flac_demuxer.c +++ b/src/combined/flac_demuxer.c @@ -713,7 +713,8 @@ demux_flac_init_class (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("FLAC demux plugin"); this->demux_class.identifier = "FLAC"; - this->demux_class.mimetypes = "application/x-flac: flac: FLAC Audio;"; + this->demux_class.mimetypes = "application/x-flac: flac: FLAC Audio;" + "application/flac: flac: FLAC Audio;"; this->demux_class.extensions = "flac"; this->demux_class.dispose = default_demux_class_dispose; diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c index e0610f5ca..b09bc1a41 100644 --- a/src/combined/xine_ogg_demuxer.c +++ b/src/combined/xine_ogg_demuxer.c @@ -2081,8 +2081,11 @@ static void *anx_init_class (xine_t *xine, void *data) { this->demux_class.identifier = "Annodex"; this->demux_class.mimetypes = "application/annodex: anx: Annodex media;" + "application/x-annodex: anx: Annodex media;" "audio/annodex: axa: Annodex audio;" - "video/annodex: axv: Annodex video;"; + "audio/x-annodex: axa: Annodex audio;" + "video/annodex: axv: Annodex video;" + "video/x-annodex: axv: Annodex video;"; this->demux_class.extensions = "anx axa axv"; this->demux_class.dispose = default_demux_class_dispose; @@ -2102,8 +2105,11 @@ static void *ogg_init_class (xine_t *xine, void *data) { this->demux_class.identifier = "OGG"; this->demux_class.mimetypes = "application/ogg: ogx: Ogg Stream;" + "application/x-ogg: ogx: Ogg Stream;" "audio/ogg: oga: Ogg Audio;" + "audio/x-ogg: oga: Ogg Audio;" "video/ogg: ogv: Ogg Video;"; + "video/x-ogg: ogv: Ogg Video;"; this->demux_class.extensions = "ogx ogv oga ogg spx ogm"; this->demux_class.dispose = default_demux_class_dispose; |