aboutsummaryrefslogtreecommitdiffstats
path: root/src/output_thread.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-10-10 08:11:04 +0200
committerMax Kellermann <max@duempel.org>2011-10-10 10:24:05 +0200
commit0847ca4ec2e137d0eaa235d653217e8a913187f8 (patch)
tree2d00b5b7e7700ee216890b83f86c6528090079a1 /src/output_thread.c
parent572d8d0cc486dce64c0f6239cc27598068c1085d (diff)
downloadmpd-0847ca4ec2e137d0eaa235d653217e8a913187f8.tar.gz
mpd-0847ca4ec2e137d0eaa235d653217e8a913187f8.tar.xz
mpd-0847ca4ec2e137d0eaa235d653217e8a913187f8.zip
pcm_{mix,volume}: pass only sample_format to pcm_mix()
The other audio_format attributes are not used.
Diffstat (limited to '')
-rw-r--r--src/output_thread.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/output_thread.c b/src/output_thread.c
index e194edc92..e6b815ce0 100644
--- a/src/output_thread.c
+++ b/src/output_thread.c
@@ -401,7 +401,7 @@ ao_filter_chunk(struct audio_output *ao, const struct music_chunk *chunk,
char *dest = pcm_buffer_get(&ao->cross_fade_buffer,
other_length);
memcpy(dest, other_data, other_length);
- pcm_mix(dest, data, length, &ao->in_audio_format,
+ pcm_mix(dest, data, length, ao->in_audio_format.format,
1.0 - chunk->mix_ratio);
data = dest;