From 74dbaade6fae1f3e869ef5666d3c680f4d747f66 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 30 Mar 2016 00:58:48 +0200
Subject: [PATCH] decoder/Thread: use "ffmpeg" as fallback instead of "mad"
Adds support for stream codecs which havn't been explicitly listed in
ffmpeg_mime_types.
---
NEWS | 2 ++
src/decoder/DecoderThread.cxx | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/NEWS b/NEWS
index e01dd3a01..74c195275 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
ver 0.19.15 (not yet released)
+* decoder
+ - ffmpeg: use as fallback instead of "mad" if no plugin matches
* fix more build failures on non-glibc builds due to constexpr Mutex
ver 0.19.14 (2016/03/18)
diff --git a/src/decoder/DecoderThread.cxx b/src/decoder/DecoderThread.cxx
index b4362a548..d5f73c3e3 100644
--- a/src/decoder/DecoderThread.cxx
+++ b/src/decoder/DecoderThread.cxx
@@ -255,7 +255,11 @@ decoder_run_stream_fallback(Decoder &decoder, InputStream &is)
{
const struct DecoderPlugin *plugin;
+#ifdef HAVE_FFMPEG
+ plugin = decoder_plugin_from_name("ffmpeg");
+#else
plugin = decoder_plugin_from_name("mad");
+#endif
return plugin != nullptr && plugin->stream_decode != nullptr &&
decoder_stream_decode(*plugin, decoder, is);
}