aboutsummaryrefslogtreecommitdiffstats
path: root/src/pcm_format.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-09-15 21:48:33 +0200
committerMax Kellermann <max@duempel.org>2011-09-15 21:48:33 +0200
commitf804a739b1c4dd96efe268a84d58bfe4750b3378 (patch)
tree6abfb38026191f3b0c720a1ffea069769df1ec53 /src/pcm_format.c
parent8751783a1b4fe8c61ac63b718be1df5f1d77d339 (diff)
parent2ed870c8546ce4654f956beea60546260d98a85c (diff)
downloadmpd-f804a739b1c4dd96efe268a84d58bfe4750b3378.tar.gz
mpd-f804a739b1c4dd96efe268a84d58bfe4750b3378.tar.xz
mpd-f804a739b1c4dd96efe268a84d58bfe4750b3378.zip
Merge branch 'v0.16.x'
Conflicts: NEWS configure.ac
Diffstat (limited to 'src/pcm_format.c')
-rw-r--r--src/pcm_format.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pcm_format.c b/src/pcm_format.c
index 4ca0b45b3..544b0ccd9 100644
--- a/src/pcm_format.c
+++ b/src/pcm_format.c
@@ -143,7 +143,7 @@ pcm_convert_16_to_24(int32_t *out, const int16_t *in,
}
static void
-pcm_convert_32_to_24(int32_t *out, const int16_t *in,
+pcm_convert_32_to_24(int32_t *out, const int32_t *in,
unsigned num_samples)
{
while (num_samples > 0) {
@@ -197,7 +197,7 @@ pcm_convert_to_24(struct pcm_buffer *buffer,
*dest_size_r = num_samples * sizeof(*dest);
dest = pcm_buffer_get(buffer, *dest_size_r);
- pcm_convert_32_to_24(dest, (const int16_t *)src,
+ pcm_convert_32_to_24(dest, (const int32_t *)src,
num_samples);
return dest;
}