From 125eb01e03082f1c33fa1b0b6d51b953eebf6c28 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 7 Nov 2014 19:22:26 +0100
Subject: [PATCH] decoder/ffmpeg: support opus

---
 NEWS                                        | 1 +
 src/decoder/plugins/FfmpegDecoderPlugin.cxx | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index d59b2eff3..94ce8d4ba 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ ver 0.19.3 (not yet released)
   - upnp: fix breakage due to malformed URIs
 * decoder
   - audiofile: fix crash while playing streams
+  - ffmpeg: support opus
 
 ver 0.19.2 (2014/11/02)
 * input
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",