git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index b8990d2033e290d49695f72a6a1255a3e925532d..2c7453371a0c7ad34980299cd108e40610600ce3 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -171,21 +171,12 @@ public:
                if(audio_streams_.empty())              \r
                        audio_streams_[nullptr].audio_data = audio_buffer_ps(audio_cadence_.front(), 0.0f);\r
                                \r
-               { // sanity check\r
-                       BOOST_FOREACH(auto& stream, audio_streams_ | boost::adaptors::map_values)\r
-                       {\r
-                               if(stream.audio_data.size() < audio_cadence_.front() && !stream.is_still)\r
-                               {\r
-                                       stream.audio_data.resize(audio_cadence_.front(), 0.0f);\r
-                                       CASPAR_LOG(trace) << "[audio_mixer] Incorrect frame audio cadence detected. Appending empty samples.";          \r
-                               }\r
-                       }               \r
-               }\r
-\r
                std::vector<float> result_ps(audio_cadence_.front(), 0.0f);\r
                BOOST_FOREACH(auto& stream, audio_streams_ | boost::adaptors::map_values)\r
                {\r
-                       CASPAR_ASSERT(stream.audio_data.size() >= result_ps.size());\r
+                       if(stream.audio_data.size() < result_ps.size())\r
+                               stream.audio_data.resize(result_ps.size(), 0.0f);\r
+\r
                        auto out = boost::range::transform(result_ps, stream.audio_data, std::begin(result_ps), std::plus<float>());\r
                        stream.audio_data.erase(std::begin(stream.audio_data), std::begin(stream.audio_data) + std::distance(std::begin(result_ps), out));\r
                }               \r