Permalink
Browse files

Merge branch 'stable'

Conflicts:
	taglib/riff/aiff/aiffproperties.cpp
	taglib/trueaudio/trueaudioproperties.cpp
	tests/test_wav.cpp
  • Loading branch information...
2 parents dcdf4fd + 110cac8 commit 3a760b060c7d35e8380798ad32421980051d7ff3 @lalinsky lalinsky committed Mar 10, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 taglib/trueaudio/trueaudioproperties.cpp
@@ -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;
}

0 comments on commit 3a760b0

Please sign in to comment.