Mercurial > hg > svcore
diff data/fileio/CodedAudioFileReader.cpp @ 383:94fc0591ea43 1.2-stable
* merge from trunk (1.2 ended up being tracked from trunk, but we may want
this branch for fixes later)
author | Chris Cannam |
---|---|
date | Wed, 27 Feb 2008 10:32:45 +0000 |
parents | 1d656dcda8ef |
children | e6d11871e4c9 |
line wrap: on
line diff
--- a/data/fileio/CodedAudioFileReader.cpp Fri Nov 30 17:36:14 2007 +0000 +++ b/data/fileio/CodedAudioFileReader.cpp Wed Feb 27 10:32:45 2008 +0000 @@ -294,7 +294,7 @@ float max = 1.0; size_t count = sz * m_channelCount; - if (m_resampler) { + if (m_resampler && m_fileRate != 0) { float ratio = float(m_sampleRate) / float(m_fileRate);