Merge branch 'v0.20.x'

2018-07-06 19:41:53 +02:00
parent 45139f94bb 6f3c0d0a60
commit 9a29d02e7e
19 changed files with 316 additions and 62 deletions
--- a/src/pcm/ConfiguredResampler.cxx
+++ b/src/pcm/ConfiguredResampler.cxx
@@ -35,6 +35,7 @@
 #include "SoxrResampler.hxx"
 #endif

+#include <assert.h>
 #include <string.h>

 enum class SelectedResampler {
--- a/src/pcm/PcmExport.cxx
+++ b/src/pcm/PcmExport.cxx
@@ -32,6 +32,8 @@
 #include "PcmDop.hxx"
 #endif

+#include <assert.h>
+
 void
 PcmExport::Open(SampleFormat sample_format, unsigned _channels,
 		Params params) noexcept