]> 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>
Fri, 2 Sep 2011 14:11:57 +0000 (14:11 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Fri, 2 Sep 2011 14:11:57 +0000 (14:11 +0000)
core/mixer/audio/audio_util.h

index ff756cb7cd525450acd731a7a2762518920bc0ba..4f45efa42d9a11fc38e7d5b72e1bdc0832e7c432 100644 (file)
@@ -13,9 +13,9 @@ static std::vector<int16_t> audio_32_to_16(const boost::iterator_range<int32_t*>
        std::vector<int16_t> audio16(input.size());\r
        auto audio32_ptr = reinterpret_cast<const uint32_t*>(input.begin());\r
        auto audio16_ptr = reinterpret_cast<uint32_t*>(audio16.data());\r
-       auto size                = input.size();\r
+       auto size                = input.size()/2;\r
        for(int n = 0; n < size; ++n)           \r
-               audio16_ptr[n] = (audio32_ptr[n*2+1] & 0xffff0000) | ((audio32_ptr[n*2+0] >> 16) & 0x0000ffff); \r
+               audio16_ptr[n] = (audio32_ptr[n*2+1] & 0xffff0000) | (audio32_ptr[n*2+0] >> 16);        \r
        return audio16;\r
 }\r
 \r