Merge tag 'v0.19.4'

2014-11-18 21:47:20 +01:00
parent f37481f843 d6bc5c35a7
commit 26382713c2
7 changed files with 40 additions and 5 deletions
--- a/src/decoder/plugins/OpusDecoderPlugin.cxx
+++ b/src/decoder/plugins/OpusDecoderPlugin.cxx
@@ -510,6 +510,13 @@ static const char *const opus_suffixes[] = {
 };

 static const char *const opus_mime_types[] = {
+	/* the official MIME type (RFC 5334) */
+	"audio/ogg",
+
+	/* deprecated (RFC 5334) */
+	"application/ogg",
+
+	/* deprecated; from an early draft */
 	"audio/opus",
 	nullptr
 };