Merge branch 'v0.19.x'

This commit is contained in:
Max Kellermann
2016-04-13 09:56:45 +02:00
3 changed files with 17 additions and 2 deletions

View File

@@ -236,7 +236,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);
}