aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder/flac_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/flac_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 '')
-rw-r--r--src/decoder/flac_plugin.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/decoder/flac_plugin.c b/src/decoder/flac_plugin.c
index 50cf1f020..ff1d1af3f 100644
--- a/src/decoder/flac_plugin.c
+++ b/src/decoder/flac_plugin.c
@@ -791,9 +791,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
};
@@ -814,7 +816,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 = {