Merge branch 'stable'

Conflicts:
	taglib/riff/aiff/aiffproperties.cpp
	taglib/trueaudio/trueaudioproperties.cpp
	tests/test_wav.cpp
This commit is contained in:
Lukáš Lalinský 2012-03-10 09:16:37 +01:00
commit 3a760b060c

View File

@ -143,7 +143,7 @@ void TrueAudio::Properties::read()
pos += 4;
d->sampleFrames = d->data.mid(pos, 4).toUInt(false);
d->length = d->sampleFrames / d->sampleRate;
d->length = d->sampleRate > 0 ? d->sampleFrames / d->sampleRate : 0;
d->bitrate = d->length > 0 ? ((d->streamLength * 8L) / d->length) / 1000 : 0;
}