aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-12-29 22:33:46 +0100
committerMax Kellermann <max@duempel.org>2009-12-29 22:33:46 +0100
commitc7d099c75736664867914fd5013a0a844cd23adc (patch)
tree5e96dcabfe51a5cefbdcbc1047d9180d1120e1e1 /src
parentd38c09051cbed3941f028fe76a1ac8ced280a549 (diff)
downloadmpd-c7d099c75736664867914fd5013a0a844cd23adc.tar.gz
mpd-c7d099c75736664867914fd5013a0a844cd23adc.tar.xz
mpd-c7d099c75736664867914fd5013a0a844cd23adc.zip
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".
Diffstat (limited to 'src')
-rw-r--r--src/decoder/ffmpeg_plugin.c5
-rw-r--r--src/decoder/flac_plugin.c10
-rw-r--r--src/decoder/oggflac_plugin.c4
-rw-r--r--src/decoder/vorbis_plugin.c7
4 files changed, 22 insertions, 4 deletions
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
};