From c7d099c75736664867914fd5013a0a844cd23adc Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 29 Dec 2009 22:33:46 +0100
Subject: [PATCH] decoder/{ffmpeg,flac,vorbis}: added more flac/vorbis MIME
 types

Support deprecated MIME types such as "audio/x-ogg".  Support new
types such as "audio/flac".
---
 NEWS                         |  2 ++
 src/decoder/ffmpeg_plugin.c  |  5 +++++
 src/decoder/flac_plugin.c    | 10 ++++++++--
 src/decoder/oggflac_plugin.c |  4 +++-
 src/decoder/vorbis_plugin.c  |  7 ++++++-
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index f8e9ca843..08d4aae47 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 ver 0.15.8 (2009/??/??)
+* decoders:
+  - ffmpeg, flac, vorbis: added more flac/vorbis MIME types
 
 
 ver 0.15.7 (2009/12/27)
diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c
index 86c20a882..d2bd642fd 100644
--- a/src/decoder/ffmpeg_plugin.c
+++ b/src/decoder/ffmpeg_plugin.c
@@ -467,6 +467,7 @@ static const char *const ffmpeg_mime_types[] = {
 	"application/ogg",
 	"application/x-ms-wmz",
 	"application/x-ms-wmd",
+	"application/x-ogg",
 	"application/x-shockwave-flash",
 	"application/x-shorten",
 	"audio/8svx",
@@ -481,6 +482,7 @@ static const char *const ffmpeg_mime_types[] = {
 	"audio/ogg",
 	"audio/qcelp",
 	"audio/vorbis",
+	"audio/vorbis+ogg",
 	"audio/x-8svx",
 	"audio/x-16sv",
 	"audio/x-aac",
@@ -498,6 +500,9 @@ static const char *const ffmpeg_mime_types[] = {
 	"audio/x-ms-wma",
 	"audio/x-ms-wax",
 	"audio/x-musepack",
+	"audio/x-ogg",
+	"audio/x-vorbis",
+	"audio/x-vorbis+ogg",
 	"audio/x-pn-realaudio",
 	"audio/x-pn-multirate-realaudio",
 	"audio/x-speex",
diff --git a/src/decoder/flac_plugin.c b/src/decoder/flac_plugin.c
index 0c0d994b7..1e568f70d 100644
--- a/src/decoder/flac_plugin.c
+++ b/src/decoder/flac_plugin.c
@@ -871,9 +871,11 @@ oggflac_decode(struct decoder *decoder, struct input_stream *input_stream)
 
 static const char *const oggflac_suffixes[] = { "ogg", "oga", NULL };
 static const char *const oggflac_mime_types[] = {
-	"audio/x-flac+ogg",
 	"application/ogg",
 	"application/x-ogg",
+	"audio/ogg",
+	"audio/x-flac+ogg",
+	"audio/x-ogg",
 	NULL
 };
 
@@ -894,7 +896,11 @@ const struct decoder_plugin oggflac_decoder_plugin = {
 
 static const char *const flac_suffixes[] = { "flac", NULL };
 static const char *const flac_mime_types[] = {
-	"audio/x-flac", "application/x-flac", NULL
+	"application/flac",
+	"application/x-flac",
+	"audio/flac",
+	"audio/x-flac",
+	NULL
 };
 
 const struct decoder_plugin flac_decoder_plugin = {
diff --git a/src/decoder/oggflac_plugin.c b/src/decoder/oggflac_plugin.c
index c0e7e35e1..bdd589ccb 100644
--- a/src/decoder/oggflac_plugin.c
+++ b/src/decoder/oggflac_plugin.c
@@ -357,9 +357,11 @@ fail:
 
 static const char *const oggflac_suffixes[] = { "ogg", "oga", NULL };
 static const char *const oggflac_mime_types[] = {
-	"audio/x-flac+ogg",
 	"application/ogg",
 	"application/x-ogg",
+	"audio/ogg",
+	"audio/x-ogg",
+	"audio/x-flac+ogg",
 	NULL
 };
 
diff --git a/src/decoder/vorbis_plugin.c b/src/decoder/vorbis_plugin.c
index d4f81e91f..0ff898647 100644
--- a/src/decoder/vorbis_plugin.c
+++ b/src/decoder/vorbis_plugin.c
@@ -405,8 +405,13 @@ static const char *const vorbis_suffixes[] = {
 
 static const char *const vorbis_mime_types[] = {
 	"application/ogg",
-	"audio/x-vorbis+ogg",
 	"application/x-ogg",
+	"audio/ogg",
+	"audio/vorbis",
+	"audio/vorbis+ogg",
+	"audio/x-ogg",
+	"audio/x-vorbis",
+	"audio/x-vorbis+ogg",
 	NULL
 };