diff options
| author | Strangerke | 2011-06-29 16:15:41 +0200 |
|---|---|---|
| committer | Strangerke | 2011-06-29 16:15:41 +0200 |
| commit | b0c9c9122fc678074aba30068e5b36d347208e65 (patch) | |
| tree | 79a99db08ec985f2e5f1e216823b1104d5b753fb /audio/decoders/adpcm.cpp | |
| parent | f2f3124246a77036f843dee2d83ad28084234ebc (diff) | |
| parent | c32a3ea0d30336771bab460ecccb58c4614e6294 (diff) | |
| download | scummvm-rg350-b0c9c9122fc678074aba30068e5b36d347208e65.tar.gz scummvm-rg350-b0c9c9122fc678074aba30068e5b36d347208e65.tar.bz2 scummvm-rg350-b0c9c9122fc678074aba30068e5b36d347208e65.zip | |
Merge branch 'master' of github.com:scummvm/scummvm into soltys_wip2
Diffstat (limited to 'audio/decoders/adpcm.cpp')
| -rw-r--r-- | audio/decoders/adpcm.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/decoders/adpcm.cpp b/audio/decoders/adpcm.cpp index d28ed222a5..f75196c882 100644 --- a/audio/decoders/adpcm.cpp +++ b/audio/decoders/adpcm.cpp @@ -342,14 +342,14 @@ do { \ _topNibble = true; \ } \ } while (0) - + int DK3_ADPCMStream::readBuffer(int16 *buffer, const int numSamples) { int samples = 0; assert((numSamples % 4) == 0); - while (samples < numSamples && !_stream->eos() && _stream->pos() < _endpos) { + while (samples < numSamples && !_stream->eos() && _stream->pos() < _endpos) { if ((_stream->pos() % _blockAlign) == 0) { _stream->readUint16LE(); // Unknown uint16 rate = _stream->readUint16LE(); // Copy of rate |