Merge pull request #2361 from birarda/master

fix for random audio-mixer crashes
This commit is contained in:
Leonardo Murillo 2014-03-18 14:33:59 -06:00
commit 949f4bac6a

View file

@ -164,7 +164,7 @@ void AudioRingBuffer::addSilentFrame(int numSilentSamples) {
_endOfLastWrite += numSilentSamples;
} else {
int numSamplesToEnd = (_buffer + _sampleCapacity) - _endOfLastWrite;
memset(_endOfLastWrite, 0, numSilentSamples * sizeof(int16_t));
memset(_endOfLastWrite, 0, numSamplesToEnd * sizeof(int16_t));
memset(_buffer, 0, (numSilentSamples - numSamplesToEnd) * sizeof(int16_t));
_endOfLastWrite = _buffer + (numSilentSamples - numSamplesToEnd);