Update demuxer for 1.2 branch to the correct extensions and mimetype declared by Xiph.

1 files changed, 8 insertions, 6 deletions

diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c
index d6b5ea214..f5a1e5306 100644
--- a/src/combined/xine_ogg_demuxer.c
+++ b/src/combined/xine_ogg_demuxer.c
@@ -2079,7 +2079,10 @@ static void *anx_init_class (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = anx_open_plugin;
   this->demux_class.description     = N_("Annodex demux plugin");
   this->demux_class.identifier      = "Annodex";
-  this->demux_class.mimetypes       = "application/x-annodex: ogg: Annodex media;";
+  this->demux_class.mimetypes       = 
+    "application/annodex: anx: Annodex media;"
+    "audio/annodex: axa: Annodex audio;"
+    "video/annodex: axv: Annodex video;";
   this->demux_class.extensions      = "anx axa axv";
   this->demux_class.dispose         = default_demux_class_dispose;
 
@@ -2098,11 +2101,10 @@ static void *ogg_init_class (xine_t *xine, void *data) {
   this->demux_class.description     = N_("OGG demux plugin");
   this->demux_class.identifier      = "OGG";
   this->demux_class.mimetypes       =
-    "audio/x-ogg: ogg: OggVorbis Audio;"
-    "audio/x-speex: ogg: Speex Audio;"
-    "application/x-ogg: ogg: Ogg Stream;"
-    "application/ogg: ogg: Ogg Stream;";
-  this->demux_class.extensions      = "ogg ogm spx";
+    "application/ogg: ogx: Ogg Stream;"
+    "audio/ogg: oga: Ogg Audio;"
+    "video/ogg: ogv: Ogg Video;"
+  this->demux_class.extensions      = "ogx ogv oga ogg spx ogm";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;