Skip to content

M
mpd
Commit 3be20518 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/Thread: check ENABLE_FFMPEG, not HAVE_FFMPEG

This repairs the damage to commit 74dbaade done by commit b3f5b493
parent ff32b0dc
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
NEWS
View file @ 3be20518
ver 0.20.6 (not yet released) ver 0.20.6 (not yet released)
* decoder * decoder
- ffmpeg: re-enable as fallback
- mpcdec: fix crash (division by zero) after seeking - mpcdec: fix crash (division by zero) after seeking
* workaround for GCC 4.9.4 / libstdc++ bug (build failure) * workaround for GCC 4.9.4 / libstdc++ bug (build failure)
......
src/decoder/DecoderThread.cxx
View file @ 3be20518
...@@ -235,7 +235,7 @@ decoder_run_stream_fallback(DecoderBridge &bridge, InputStream &is) ...@@ -235,7 +235,7 @@ decoder_run_stream_fallback(DecoderBridge &bridge, InputStream &is)
{ {
const struct DecoderPlugin *plugin; const struct DecoderPlugin *plugin;
#ifdef HAVE_FFMPEG #ifdef ENABLE_FFMPEG
plugin = decoder_plugin_from_name("ffmpeg"); plugin = decoder_plugin_from_name("ffmpeg");
#else #else
plugin = decoder_plugin_from_name("mad"); plugin = decoder_plugin_from_name("mad");
......
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