oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.18.x'

This commit is contained in:
Max Kellermann 2014-08-21 12:52:27 +02:00
parent e6177c3349 78abcd7df7
commit 455fd180b1
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -63,6 +63,7 @@ ver 0.19 (not yet released)
ver 0.18.13 (not yet released) ver 0.18.13 (not yet released)
* decoder * decoder
- dsdiff, dsf: fix endless loop on malformed file
- ffmpeg: support ffmpeg/libav version 11 - ffmpeg: support ffmpeg/libav version 11
ver 0.18.12 (2014/07/30) ver 0.18.12 (2014/07/30)

2
src/decoder/plugins/DsdiffDecoderPlugin.cxx
View File

@ -366,7 +366,7 @@ dsdiff_decode_chunk(Decoder &decoder, InputStream &is,
const unsigned buffer_samples = buffer_frames * frame_size; const unsigned buffer_samples = buffer_frames * frame_size;
const size_t buffer_size = buffer_samples * sample_size; const size_t buffer_size = buffer_samples * sample_size;
while (chunk_size > 0) { while (chunk_size >= frame_size) {
/* see how much aligned data from the remaining chunk /* see how much aligned data from the remaining chunk
fits into the local buffer */ fits into the local buffer */
size_t now_size = buffer_size; size_t now_size = buffer_size;

2
src/decoder/plugins/DsfDecoderPlugin.cxx
View File

@ -232,7 +232,7 @@ dsf_decode_chunk(Decoder &decoder, InputStream &is,
const unsigned buffer_samples = buffer_frames * frame_size; const unsigned buffer_samples = buffer_frames * frame_size;
const size_t buffer_size = buffer_samples * sample_size; const size_t buffer_size = buffer_samples * sample_size;
while (chunk_size > 0) { while (chunk_size >= frame_size) {
/* see how much aligned data from the remaining chunk /* see how much aligned data from the remaining chunk
fits into the local buffer */ fits into the local buffer */
size_t now_size = buffer_size; size_t now_size = buffer_size;