Merge branch 'stable'
authorLukáš Lalinský <lalinsky@gmail.com>
Sat, 10 Mar 2012 08:16:37 +0000 (09:16 +0100)
committerLukáš Lalinský <lalinsky@gmail.com>
Sat, 10 Mar 2012 08:16:37 +0000 (09:16 +0100)
Conflicts:
taglib/riff/aiff/aiffproperties.cpp
taglib/trueaudio/trueaudioproperties.cpp
tests/test_wav.cpp

1  2 
taglib/trueaudio/trueaudioproperties.cpp

index 1e4e87d3da6e7436f5972faed0dfbe148a09a7d0,3cab855bf6e191587c1a9cf1b828b2100406fd83..c52a13efdc0f9298bda24df36fe6879048c52863
@@@ -142,8 -135,8 +142,8 @@@ void TrueAudio::Properties::read(
      d->sampleRate = d->data.mid(pos, 4).toUInt(false);
      pos += 4;
  
 -    uint sampleFrames = d->data.mid(pos, 4).toUInt(false);
 -    d->length = d->sampleRate > 0 ? sampleFrames / d->sampleRate : 0;
 +    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;
    }