From: ronag Date: Fri, 2 Sep 2011 14:11:57 +0000 (+0000) Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... X-Git-Tag: 2.0.1~34 X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=13bbffbc95b0507de36d7e093970d053d5e21521 git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1323 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- diff --git a/core/mixer/audio/audio_util.h b/core/mixer/audio/audio_util.h index ff756cb7c..4f45efa42 100644 --- a/core/mixer/audio/audio_util.h +++ b/core/mixer/audio/audio_util.h @@ -13,9 +13,9 @@ static std::vector audio_32_to_16(const boost::iterator_range std::vector audio16(input.size()); auto audio32_ptr = reinterpret_cast(input.begin()); auto audio16_ptr = reinterpret_cast(audio16.data()); - auto size = input.size(); + auto size = input.size()/2; for(int n = 0; n < size; ++n) - audio16_ptr[n] = (audio32_ptr[n*2+1] & 0xffff0000) | ((audio32_ptr[n*2+0] >> 16) & 0x0000ffff); + audio16_ptr[n] = (audio32_ptr[n*2+1] & 0xffff0000) | (audio32_ptr[n*2+0] >> 16); return audio16; }