Merge branch 'v0.22.x'

src/input/plugins/QobuzLoginRequest.cxx

@@ -23,6 +23,8 @@
 #include "lib/curl/Form.hxx"
 #include "lib/yajl/Callbacks.hxx"
 
+#include <cassert>
+
 using Wrapper = Yajl::CallbacksWrapper<QobuzLoginRequest::ResponseParser>;
 static constexpr yajl_callbacks parse_callbacks = {
 	nullptr,

src/input/plugins/TidalLoginRequest.cxx

@@ -23,6 +23,8 @@
 #include "lib/yajl/Callbacks.hxx"
 #include "lib/yajl/ResponseParser.hxx"
 
+#include <cassert>
+
 using Wrapper = Yajl::CallbacksWrapper<TidalLoginRequest::ResponseParser>;
 static constexpr yajl_callbacks parse_callbacks = {
 	nullptr,

src/input/plugins/TidalTagScanner.cxx

@@ -23,6 +23,8 @@
 #include "tag/Builder.hxx"
 #include "tag/Tag.hxx"
 
+#include <cassert>
+
 using Wrapper = Yajl::CallbacksWrapper<TidalTagScanner::ResponseParser>;
 static constexpr yajl_callbacks parse_callbacks = {
 	nullptr,

src/input/plugins/TidalTrackRequest.cxx

@@ -21,6 +21,8 @@
 #include "TidalErrorParser.hxx"
 #include "lib/yajl/Callbacks.hxx"
 
+#include <cassert>
+
 using Wrapper = Yajl::CallbacksWrapper<TidalTrackRequest::ResponseParser>;
 static constexpr yajl_callbacks parse_callbacks = {
 	nullptr,

src/lib/ffmpeg/Filter.hxx

@@ -20,6 +20,9 @@
 #ifndef MPD_FFMPEG_FILTER_HXX
 #define MPD_FFMPEG_FILTER_HXX
 
+/* necessary because libavutil/common.h uses UINT64_C */
+#define __STDC_CONSTANT_MACROS
+
 #include "Error.hxx"
 
 extern "C" {