Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

diff --git a/modules/ffmpeg/producer/util/util.cpp b/modules/ffmpeg/producer/util/util.cpp
index 652a9a7ccc9b4107154d9e436d4ac0d4e5644080..3546305f55ae61eeee43b1dd0d33a08b249c96ed 100644 (file)
--- a/modules/ffmpeg/producer/util/util.cpp
+++ b/modules/ffmpeg/producer/util/util.cpp
@@ -588,7 +588,7 @@ bool is_valid_file(const std::wstring& filename, bool only_video)
                buf.push_back(*file_it);
 
        if(buf.empty())
-               return nullptr;
+               return false;
 
        pb.buf          = buf.data();
        pb.buf_size = static_cast<int>(buf.size());