diff options
| author | Max Kellermann <max@duempel.org> | 2013-11-23 18:45:02 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-11-23 18:45:02 +0100 |
| commit | 99527051b5751d2ef7c6b593f1beda84d1bcc33f (patch) | |
| tree | 39b08616c597fc173022164050ed557650c177b5 /src/decoder/DsdiffDecoderPlugin.cxx | |
| parent | bed98303a346dd98e2a239579c032d170440441d (diff) | |
| parent | 57e0cc54424561499039967aa501c17d4b179019 (diff) | |
| download | mpd-99527051b5751d2ef7c6b593f1beda84d1bcc33f.tar.gz mpd-99527051b5751d2ef7c6b593f1beda84d1bcc33f.tar.xz mpd-99527051b5751d2ef7c6b593f1beda84d1bcc33f.zip | |
Merge branch 'v0.18.x'
Diffstat (limited to 'src/decoder/DsdiffDecoderPlugin.cxx')
| -rw-r--r-- | src/decoder/DsdiffDecoderPlugin.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/decoder/DsdiffDecoderPlugin.cxx b/src/decoder/DsdiffDecoderPlugin.cxx index 347f5b586..a3c0149b9 100644 --- a/src/decoder/DsdiffDecoderPlugin.cxx +++ b/src/decoder/DsdiffDecoderPlugin.cxx @@ -294,7 +294,6 @@ dsdiff_read_metadata_extra(Decoder *decoder, InputStream &is, if (!dsdiff_read_chunk_header(decoder, is, chunk_header)) return false; } - chunk_size = 0; } /* done processing chunk headers, process tags if any */ @@ -385,10 +384,10 @@ dsdiff_decode_chunk(Decoder &decoder, InputStream &is, while (chunk_size > 0) { /* see how much aligned data from the remaining chunk fits into the local buffer */ - unsigned now_frames = buffer_frames; size_t now_size = buffer_size; if (chunk_size < (uint64_t)now_size) { - now_frames = (unsigned)chunk_size / frame_size; + unsigned now_frames = + (unsigned)chunk_size / frame_size; now_size = now_frames * frame_size; } |