diff options
| author | Max Kellermann <max@duempel.org> | 2016-04-13 09:56:45 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2016-04-13 10:03:40 +0200 |
| commit | 33fdaa5b6d66a9a296e8ba170098b10f24be523b (patch) | |
| tree | 943670c7e6001adf109da0dca1ab31f8e6c15686 /src/decoder/DecoderThread.cxx | |
| parent | 6a1f5667f95f99c4f4457f370abb10172fa7751e (diff) | |
| parent | 70495aada1a1e655b24173ca77d20c71af0dbc8c (diff) | |
Merge branch 'v0.19.x'
Diffstat (limited to 'src/decoder/DecoderThread.cxx')
| -rw-r--r-- | src/decoder/DecoderThread.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/decoder/DecoderThread.cxx b/src/decoder/DecoderThread.cxx index 0378b803f..f7aafa00f 100644 --- a/src/decoder/DecoderThread.cxx +++ b/src/decoder/DecoderThread.cxx @@ -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); } |