oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/Thread: check ENABLE_FFMPEG, not HAVE_FFMPEG 

This repairs the damage to commit 74dbaade6f done by commit
b3f5b4932c
This commit is contained in:
Max Kellermann 2017-03-01 17:06:23 +01:00
parent ff32b0dc9b
commit 3be2051808
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -1,5 +1,6 @@
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)

2
src/decoder/DecoderThread.cxx
View File

@ -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");