]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Tue, 20 Mar 2012 00:14:03 +0000 (00:14 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Tue, 20 Mar 2012 00:14:03 +0000 (00:14 +0000)
core/mixer/audio/audio_mixer.cpp

index 2bbf2f779d484cb2e9bee0091562b1bbd8788fb9..b8990d2033e290d49695f72a6a1255a3e925532d 100644 (file)
@@ -185,7 +185,7 @@ public:
                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
+                       CASPAR_ASSERT(stream.audio_data.size() >= result_ps.size());\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