decoder/Thread: use "ffmpeg" as fallback instead of "mad"

Adds support for stream codecs which havn't been explicitly listed in ffmpeg_mime_types.

decoder/Thread: use "ffmpeg" as fallback instead of "mad"
74dbaade · Max Kellermann · 53677172 · 74dbaade · 74dbaade
Commit 74dbaade authored 9 years ago by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

NEWS NEWS +2 -0

DecoderThread.cxx src/decoder/DecoderThread.cxx +4 -0

No files found.
--- a/NEWS
+++ b/NEWS
 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)

--- 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);
 }