aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder/plugins
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-11-07 19:41:19 +0100
committerMax Kellermann <max@duempel.org>2014-11-07 19:41:19 +0100
commit2d9876a261d62192b5ce976eae376ac4e1fd4b38 (patch)
tree7ad2b73867f1bf0a76d8058df30e0ad68aa42c97 /src/decoder/plugins
parent303d67aed2da79d4ddaa3a52093ed42ae9da064d (diff)
parent125eb01e03082f1c33fa1b0b6d51b953eebf6c28 (diff)
downloadmpd-2d9876a261d62192b5ce976eae376ac4e1fd4b38.tar.gz
mpd-2d9876a261d62192b5ce976eae376ac4e1fd4b38.tar.xz
mpd-2d9876a261d62192b5ce976eae376ac4e1fd4b38.zip
Merge branch 'v0.19.x'
Diffstat (limited to 'src/decoder/plugins')
-rw-r--r--src/decoder/plugins/FfmpegDecoderPlugin.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
index 2e72269b2..466caa3d1 100644
--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@@ -657,7 +657,7 @@ static const char *const ffmpeg_suffixes[] = {
"mj2", "mjpeg", "mjpg", "mka", "mkv", "mlp", "mm", "mmf", "mov", "mp+",
"mp1", "mp2", "mp3", "mp4", "mpc", "mpeg", "mpg", "mpga", "mpp", "mpu",
"mve", "mvi", "mxf", "nc", "nsv", "nut", "nuv", "oga", "ogm", "ogv",
- "ogx", "oma", "ogg", "omg", "psp", "pva", "qcp", "qt", "r3d", "ra",
+ "ogx", "oma", "ogg", "omg", "opus", "psp", "pva", "qcp", "qt", "r3d", "ra",
"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",
@@ -691,6 +691,7 @@ static const char *const ffmpeg_mime_types[] = {
"audio/mpeg",
"audio/musepack",
"audio/ogg",
+ "audio/opus",
"audio/qcelp",
"audio/vorbis",
"audio/vorbis+ogg",