Skip to content

M
mpd
Commit 74dbaade authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

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

Adds support for stream codecs which havn't been explicitly listed in ffmpeg_mime_types.
parent 53677172
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
NEWS
View file @ 74dbaade
ver 0.19.15 (not yet released) 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 * fix more build failures on non-glibc builds due to constexpr Mutex
ver 0.19.14 (2016/03/18) ver 0.19.14 (2016/03/18)
......
src/decoder/DecoderThread.cxx
View file @ 74dbaade
...@@ -255,7 +255,11 @@ decoder_run_stream_fallback(Decoder &decoder, InputStream &is) ...@@ -255,7 +255,11 @@ decoder_run_stream_fallback(Decoder &decoder, InputStream &is)
{ {
const struct DecoderPlugin *plugin; const struct DecoderPlugin *plugin;
#ifdef HAVE_FFMPEG
plugin = decoder_plugin_from_name("ffmpeg");
#else
plugin = decoder_plugin_from_name("mad"); plugin = decoder_plugin_from_name("mad");
#endif
return plugin != nullptr && plugin->stream_decode != nullptr && return plugin != nullptr && plugin->stream_decode != nullptr &&
decoder_stream_decode(*plugin, decoder, is); decoder_stream_decode(*plugin, decoder, is);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment