diff options
| author | Thibaut Mattern <thibaut.mattern@gmail.com> | 2008-01-19 13:54:18 +0100 |
|---|---|---|
| committer | Thibaut Mattern <thibaut.mattern@gmail.com> | 2008-01-19 13:54:18 +0100 |
| commit | 394ab44016fe8b0df951718e4888a9df28895618 (patch) | |
| tree | 0ab916ec8a7c2ed8c897147c1b692009a46edf9b /src/demuxers | |
| parent | ce16be132cec33879e3f1521997aa30993d7fd93 (diff) | |
| parent | 4b30fc7d0ad482d4449703e9270df933cdd755ee (diff) | |
| download | xine-lib-394ab44016fe8b0df951718e4888a9df28895618.tar.gz xine-lib-394ab44016fe8b0df951718e4888a9df28895618.tar.bz2 | |
Merge
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/demux_ogg.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index 9ed39f12d..d1b522727 100644 --- a/src/demuxers/demux_ogg.c +++ b/src/demuxers/demux_ogg.c @@ -2118,7 +2118,9 @@ static const char *anx_get_extensions (demux_class_t *this_gen) { } static const char *anx_get_mimetypes (demux_class_t *this_gen) { - return "application/x-annodex: ogg: Annodex media;"; + return "application/annodex: anx: Annodex media;" + "audio/annodex: axa: Annodex audio;" + "video/annodex: axv: Annodex video;"; } static void anx_class_dispose (demux_class_t *this_gen) { @@ -2155,14 +2157,13 @@ static const char *ogg_get_identifier (demux_class_t *this_gen) { } static const char *ogg_get_extensions (demux_class_t *this_gen) { - return "ogg ogm spx"; + return "ogx ogv oga ogg spx ogm"; } static const char *ogg_get_mimetypes (demux_class_t *this_gen) { - return "audio/x-ogg: ogg: OggVorbis Audio;" - "audio/x-speex: ogg: Speex Audio;" - "application/x-ogg: ogg: Ogg Stream;" - "application/ogg: ogg: Ogg Stream;"; + return "application/ogg: ogx: Ogg Stream;" + "audio/ogg: oga: Ogg Audio;" + "video/ogg: ogv: Ogg Video;"; } static void ogg_class_dispose (demux_class_t *this_gen) { |