aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder/vorbis_plugin.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-12-30 23:24:11 +0100
committerMax Kellermann <max@duempel.org>2009-12-30 23:24:11 +0100
commitefc885a9dc2e6632ca2a24a0ff52ab51bb1d82d1 (patch)
tree5ef9fd5214b0b9ffdea14906e45c9cfcb1380837 /src/decoder/vorbis_plugin.c
parent333e11d0ebb255a2cd04cfde805e68f257b8a2f5 (diff)
parent4419e5b90dc229c8839de142e22aeba8336fbbd4 (diff)
downloadmpd-efc885a9dc2e6632ca2a24a0ff52ab51bb1d82d1.tar.gz
mpd-efc885a9dc2e6632ca2a24a0ff52ab51bb1d82d1.tar.xz
mpd-efc885a9dc2e6632ca2a24a0ff52ab51bb1d82d1.zip
Merge vorbis+icy fixes from branch 'v0.15.x'
Conflicts: Makefile.am NEWS configure.ac src/input/curl_input_plugin.c src/input_stream.c
Diffstat (limited to '')
-rwxr-xr-xsrc/decoder/vorbis_plugin.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/decoder/vorbis_plugin.c b/src/decoder/vorbis_plugin.c
index f0285de72..b323cf775 100755
--- a/src/decoder/vorbis_plugin.c
+++ b/src/decoder/vorbis_plugin.c
@@ -420,8 +420,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
};