aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2010-01-17 16:00:14 +0100
committerMax Kellermann <max@duempel.org>2010-01-17 16:00:14 +0100
commit2579a2f924091b3e48a9cb5eac82a85078dfa05b (patch)
tree50aa50c21a23db72d5fd75c5c65677704f40cfda /src
parenta7664b98ba5ec05a1104df4f328de898e0429126 (diff)
downloadmpd-2579a2f924091b3e48a9cb5eac82a85078dfa05b.tar.gz
mpd-2579a2f924091b3e48a9cb5eac82a85078dfa05b.tar.xz
mpd-2579a2f924091b3e48a9cb5eac82a85078dfa05b.zip
decoder/ffmpeg: added more MIME types
Taken from the ffmpeg sources.
Diffstat (limited to 'src')
-rw-r--r--src/decoder/ffmpeg_plugin.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c
index 0e15d99c1..2a46601f4 100644
--- a/src/decoder/ffmpeg_plugin.c
+++ b/src/decoder/ffmpeg_plugin.c
@@ -486,6 +486,7 @@ static const char *const ffmpeg_suffixes[] = {
};
static const char *const ffmpeg_mime_types[] = {
+ "application/m4a",
"application/mp4",
"application/octet-stream",
"application/ogg",
@@ -498,9 +499,12 @@ static const char *const ffmpeg_mime_types[] = {
"audio/16sv",
"audio/aac",
"audio/ac3",
+ "audio/aiff"
"audio/amr",
"audio/basic",
"audio/flac",
+ "audio/m4a",
+ "audio/mp4",
"audio/mpeg",
"audio/musepack",
"audio/ogg",
@@ -519,6 +523,7 @@ static const char *const ffmpeg_mime_types[] = {
"audio/x-flac",
"audio/x-gsm",
"audio/x-mace",
+ "audio/x-matroska",
"audio/x-monkeys-audio",
"audio/x-mpeg",
"audio/x-ms-wma",
@@ -531,6 +536,7 @@ static const char *const ffmpeg_mime_types[] = {
"audio/x-pn-multirate-realaudio",
"audio/x-speex",
"audio/x-tta"
+ "audio/x-voc",
"audio/x-wav",
"audio/x-wma",
"audio/x-wv",