diff options
| author | Max Kellermann <max@duempel.org> | 2011-10-09 16:32:36 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-10-09 16:32:36 +0200 |
| commit | b9e99575cec8740a9db548e0b4dd4662dfa273de (patch) | |
| tree | 08376a3d11f86a03f167c7d4500e1c56329d8441 | |
| parent | accd26256185f4627583057ff3fafa39b5bc6387 (diff) | |
| parent | 30414093349f15639374006e3be7136cd6642a59 (diff) | |
| download | mpd-b9e99575cec8740a9db548e0b4dd4662dfa273de.tar.gz mpd-b9e99575cec8740a9db548e0b4dd4662dfa273de.tar.xz mpd-b9e99575cec8740a9db548e0b4dd4662dfa273de.zip | |
Merge commit 'release-0.16.5'
Conflicts:
NEWS
configure.ac
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/decoder/wavpack_decoder_plugin.c | 2 | ||||
| -rw-r--r-- | src/pcm_convert.c | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -27,7 +27,7 @@ ver 0.17 (2011/??/??) * allow port specification in "bind_to_address" settings -ver 0.16.5 (2010/??/??) +ver 0.16.5 (2010/10/09) * configure.ac - disable assertions in the non-debugging build - show solaris plugin result correctly diff --git a/src/decoder/wavpack_decoder_plugin.c b/src/decoder/wavpack_decoder_plugin.c index bfb13b2a4..487831088 100644 --- a/src/decoder/wavpack_decoder_plugin.c +++ b/src/decoder/wavpack_decoder_plugin.c @@ -176,7 +176,7 @@ wavpack_decode(struct decoder *decoder, WavpackContext *wpc, bool can_seek) return; } - if ((WavpackGetMode(wpc) & MODE_FLOAT) == MODE_FLOAT) { + if (is_float) { format_samples = format_samples_float; } else { format_samples = format_samples_int; diff --git a/src/pcm_convert.c b/src/pcm_convert.c index 59dc0d5c4..b507999fa 100644 --- a/src/pcm_convert.c +++ b/src/pcm_convert.c @@ -222,7 +222,7 @@ pcm_convert_32(struct pcm_convert_state *state, src_buffer, src_size, &len); if (buf == NULL) { g_set_error(error_r, pcm_convert_quark(), 0, - "Conversion from %s to 24 bit is not implemented", + "Conversion from %s to 32 bit is not implemented", sample_format_to_string(src_format->format)); return NULL; } |