Merge tag 'v0.20.6'

release v0.20.6

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

src/decoder/plugins/MpcdecDecoderPlugin.cxx

@@ -207,6 +207,15 @@ mpcdec_decode(DecoderClient &client, InputStream &is)
 		if (frame.bits == -1)
 			break;
 
+		if (frame.samples <= 0) {
+			/* empty frame - this has been observed to
+			   happen spuriously after seeking; skip this
+			   obscure frame, and hope libmpcdec
+			   recovers */
+			cmd = client.GetCommand();
+			continue;
+		}
+
 		mpc_uint32_t ret = frame.samples;
 		ret *= info.channels;
 

src/decoder/plugins/SidplayDecoderPlugin.cxx

@@ -50,6 +50,10 @@
 #include <string.h>
 #include <stdio.h>
 
+#ifdef HAVE_SIDPLAYFP
+#define LIBSIDPLAYFP_VERSION GCC_MAKE_VERSION(LIBSIDPLAYFP_VERSION_MAJ, LIBSIDPLAYFP_VERSION_MIN, LIBSIDPLAYFP_VERSION_LEV)
+#endif
+
 #define SUBTUNE_PREFIX "tune_"
 
 static constexpr Domain sidplay_domain("sidplay");
@@ -285,7 +289,11 @@ sidplay_file_decode(DecoderClient &client, Path path_fs)
 #endif
 
 #ifdef HAVE_SIDPLAYFP
+#if LIBSIDPLAYFP_VERSION >= GCC_MAKE_VERSION(1,8,0)
 	const bool stereo = tune.getInfo()->sidChips() >= 2;
+#else
+	const bool stereo = tune.getInfo()->isStereo();
+#endif
 #else
 	const bool stereo = tune.isStereo();
 #endif

src/decoder/plugins/WavpackDecoderPlugin.cxx

@@ -34,6 +34,8 @@
 #include <stdexcept>
 #include <memory>
 
+#include <cstdlib>
+
 #include <assert.h>
 
 #define ERRORLEN 80