Skip to content

M
mpd
Commit b9e99575 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

Merge commit 'release-0.16.5'

Conflicts: NEWS configure.ac
parents accd2625 30414093
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
NEWS
View file @ b9e99575
...@@ -27,7 +27,7 @@ ver 0.17 (2011/??/??) ...@@ -27,7 +27,7 @@ ver 0.17 (2011/??/??)
* allow port specification in "bind_to_address" settings * allow port specification in "bind_to_address" settings
ver 0.16.5 (2010/??/??) ver 0.16.5 (2010/10/09)
* configure.ac * configure.ac
- disable assertions in the non-debugging build - disable assertions in the non-debugging build
- show solaris plugin result correctly - show solaris plugin result correctly
......
src/decoder/wavpack_decoder_plugin.c
View file @ b9e99575
...@@ -176,7 +176,7 @@ wavpack_decode(struct decoder *decoder, WavpackContext *wpc, bool can_seek) ...@@ -176,7 +176,7 @@ wavpack_decode(struct decoder *decoder, WavpackContext *wpc, bool can_seek)
return; return;
} }
if ((WavpackGetMode(wpc) & MODE_FLOAT) == MODE_FLOAT) { if (is_float) {
format_samples = format_samples_float; format_samples = format_samples_float;
} else { } else {
format_samples = format_samples_int; format_samples = format_samples_int;
......
src/pcm_convert.c
View file @ b9e99575
...@@ -222,7 +222,7 @@ pcm_convert_32(struct pcm_convert_state *state, ...@@ -222,7 +222,7 @@ pcm_convert_32(struct pcm_convert_state *state,
src_buffer, src_size, &len); src_buffer, src_size, &len);
if (buf == NULL) { if (buf == NULL) {
g_set_error(error_r, pcm_convert_quark(), 0, 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)); sample_format_to_string(src_format->format));
return NULL; return NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment