Commit c7d099c7 authored by Max Kellermann's avatar Max Kellermann

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".
parent d38c0905
ver 0.15.8 (2009/??/??) ver 0.15.8 (2009/??/??)
* decoders:
- ffmpeg, flac, vorbis: added more flac/vorbis MIME types
ver 0.15.7 (2009/12/27) ver 0.15.7 (2009/12/27)
......
...@@ -467,6 +467,7 @@ static const char *const ffmpeg_mime_types[] = { ...@@ -467,6 +467,7 @@ static const char *const ffmpeg_mime_types[] = {
"application/ogg", "application/ogg",
"application/x-ms-wmz", "application/x-ms-wmz",
"application/x-ms-wmd", "application/x-ms-wmd",
"application/x-ogg",
"application/x-shockwave-flash", "application/x-shockwave-flash",
"application/x-shorten", "application/x-shorten",
"audio/8svx", "audio/8svx",
...@@ -481,6 +482,7 @@ static const char *const ffmpeg_mime_types[] = { ...@@ -481,6 +482,7 @@ static const char *const ffmpeg_mime_types[] = {
"audio/ogg", "audio/ogg",
"audio/qcelp", "audio/qcelp",
"audio/vorbis", "audio/vorbis",
"audio/vorbis+ogg",
"audio/x-8svx", "audio/x-8svx",
"audio/x-16sv", "audio/x-16sv",
"audio/x-aac", "audio/x-aac",
...@@ -498,6 +500,9 @@ static const char *const ffmpeg_mime_types[] = { ...@@ -498,6 +500,9 @@ static const char *const ffmpeg_mime_types[] = {
"audio/x-ms-wma", "audio/x-ms-wma",
"audio/x-ms-wax", "audio/x-ms-wax",
"audio/x-musepack", "audio/x-musepack",
"audio/x-ogg",
"audio/x-vorbis",
"audio/x-vorbis+ogg",
"audio/x-pn-realaudio", "audio/x-pn-realaudio",
"audio/x-pn-multirate-realaudio", "audio/x-pn-multirate-realaudio",
"audio/x-speex", "audio/x-speex",
......
...@@ -871,9 +871,11 @@ oggflac_decode(struct decoder *decoder, struct input_stream *input_stream) ...@@ -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_suffixes[] = { "ogg", "oga", NULL };
static const char *const oggflac_mime_types[] = { static const char *const oggflac_mime_types[] = {
"audio/x-flac+ogg",
"application/ogg", "application/ogg",
"application/x-ogg", "application/x-ogg",
"audio/ogg",
"audio/x-flac+ogg",
"audio/x-ogg",
NULL NULL
}; };
...@@ -894,7 +896,11 @@ const struct decoder_plugin oggflac_decoder_plugin = { ...@@ -894,7 +896,11 @@ const struct decoder_plugin oggflac_decoder_plugin = {
static const char *const flac_suffixes[] = { "flac", NULL }; static const char *const flac_suffixes[] = { "flac", NULL };
static const char *const flac_mime_types[] = { 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 = { const struct decoder_plugin flac_decoder_plugin = {
......
...@@ -357,9 +357,11 @@ fail: ...@@ -357,9 +357,11 @@ fail:
static const char *const oggflac_suffixes[] = { "ogg", "oga", NULL }; static const char *const oggflac_suffixes[] = { "ogg", "oga", NULL };
static const char *const oggflac_mime_types[] = { static const char *const oggflac_mime_types[] = {
"audio/x-flac+ogg",
"application/ogg", "application/ogg",
"application/x-ogg", "application/x-ogg",
"audio/ogg",
"audio/x-ogg",
"audio/x-flac+ogg",
NULL NULL
}; };
......
...@@ -405,8 +405,13 @@ static const char *const vorbis_suffixes[] = { ...@@ -405,8 +405,13 @@ static const char *const vorbis_suffixes[] = {
static const char *const vorbis_mime_types[] = { static const char *const vorbis_mime_types[] = {
"application/ogg", "application/ogg",
"audio/x-vorbis+ogg",
"application/x-ogg", "application/x-ogg",
"audio/ogg",
"audio/vorbis",
"audio/vorbis+ogg",
"audio/x-ogg",
"audio/x-vorbis",
"audio/x-vorbis+ogg",
NULL NULL
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment