From 3be205180868f3208de966af83ac415227394f4b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 1 Mar 2017 17:06:23 +0100 Subject: [PATCH] decoder/Thread: check ENABLE_FFMPEG, not HAVE_FFMPEG This repairs the damage to commit 74dbaade6fa done by commit b3f5b4932c3 --- NEWS | 1 + src/decoder/DecoderThread.cxx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index b4c74d7f7..0b21fefe7 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ ver 0.20.6 (not yet released) * decoder + - ffmpeg: re-enable as fallback - mpcdec: fix crash (division by zero) after seeking * workaround for GCC 4.9.4 / libstdc++ bug (build failure) diff --git a/src/decoder/DecoderThread.cxx b/src/decoder/DecoderThread.cxx index 3dbc11179..551b1c641 100644 --- a/src/decoder/DecoderThread.cxx +++ b/src/decoder/DecoderThread.cxx @@ -235,7 +235,7 @@ decoder_run_stream_fallback(DecoderBridge &bridge, InputStream &is) { const struct DecoderPlugin *plugin; -#ifdef HAVE_FFMPEG +#ifdef ENABLE_FFMPEG plugin = decoder_plugin_from_name("ffmpeg"); #else plugin = decoder_plugin_from_name("mad");