aboutsummaryrefslogtreecommitdiffstats
path: root/src/pcm_convert.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-10-09 16:32:36 +0200
committerMax Kellermann <max@duempel.org>2011-10-09 16:32:36 +0200
commitb9e99575cec8740a9db548e0b4dd4662dfa273de (patch)
tree08376a3d11f86a03f167c7d4500e1c56329d8441 /src/pcm_convert.c
parentaccd26256185f4627583057ff3fafa39b5bc6387 (diff)
parent30414093349f15639374006e3be7136cd6642a59 (diff)
downloadmpd-b9e99575cec8740a9db548e0b4dd4662dfa273de.tar.gz
mpd-b9e99575cec8740a9db548e0b4dd4662dfa273de.tar.xz
mpd-b9e99575cec8740a9db548e0b4dd4662dfa273de.zip
Merge commit 'release-0.16.5'
Conflicts: NEWS configure.ac
Diffstat (limited to '')
-rw-r--r--src/pcm_convert.c2
1 files changed, 1 insertions, 1 deletions
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;
}