From 55b066ffebc8e50b2e924c7971cbd693750ee2fa Mon Sep 17 00:00:00 2001 From: ronag Date: Tue, 20 Mar 2012 00:14:03 +0000 Subject: [PATCH] git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2690 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- core/mixer/audio/audio_mixer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp index 2bbf2f779..b8990d203 100644 --- a/core/mixer/audio/audio_mixer.cpp +++ b/core/mixer/audio/audio_mixer.cpp @@ -185,7 +185,7 @@ public: std::vector result_ps(audio_cadence_.front(), 0.0f); BOOST_FOREACH(auto& stream, audio_streams_ | boost::adaptors::map_values) { - CASPAR_ASSERT(stream.audio_data.size() == result_ps.size()); + CASPAR_ASSERT(stream.audio_data.size() >= result_ps.size()); auto out = boost::range::transform(result_ps, stream.audio_data, std::begin(result_ps), std::plus()); stream.audio_data.erase(std::begin(stream.audio_data), std::begin(stream.audio_data) + std::distance(std::begin(result_ps), out)); } -- 2.39.5