aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Neuschäfer <j.neuschaefer@gmx.net>2012-05-22 23:36:47 +0200
committerMax Kellermann <max@duempel.org>2012-05-29 22:38:40 +0200
commit8b6b25220d331dccf589e35be04f591467d8d249 (patch)
tree512bf1e5a1360bae92891101fdbab457dc3b4426
parentd3cc8e0ac008cb266f4ce03da94f0d9f8d34d20e (diff)
downloadmpd-8b6b25220d331dccf589e35be04f591467d8d249.tar.gz
mpd-8b6b25220d331dccf589e35be04f591467d8d249.tar.xz
mpd-8b6b25220d331dccf589e35be04f591467d8d249.zip
decoder/ffmpeg: add webm as a supported format
Diffstat (limited to '')
-rw-r--r--NEWS2
-rw-r--r--src/decoder/ffmpeg_decoder_plugin.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 16f08e216..00972bab4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
ver 0.16.9 (2012/??/??)
+* decoder:
+ - ffmpeg: support WebM
ver 0.16.8 (2012/04/04)
diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c
index 2929d316a..3bb3a07b6 100644
--- a/src/decoder/ffmpeg_decoder_plugin.c
+++ b/src/decoder/ffmpeg_decoder_plugin.c
@@ -745,7 +745,8 @@ static const char *const ffmpeg_suffixes[] = {
"ram", "rl2", "rm", "rmvb", "roq", "rpl", "rvc", "shn", "smk", "snd",
"sol", "son", "spx", "str", "swf", "tgi", "tgq", "tgv", "thp", "ts",
"tsp", "tta", "xa", "xvid", "uv", "uv2", "vb", "vid", "vob", "voc",
- "vp6", "vmd", "wav", "wma", "wmv", "wsaud", "wsvga", "wv", "wve",
+ "vp6", "vmd", "wav", "webm", "wma", "wmv", "wsaud", "wsvga", "wv",
+ "wve",
NULL
};
@@ -809,6 +810,7 @@ static const char *const ffmpeg_mime_types[] = {
"video/msvideo",
"video/ogg",
"video/theora",
+ "video/webm",
"video/x-dv",
"video/x-flv",
"video/x-matroska",