From 0847ca4ec2e137d0eaa235d653217e8a913187f8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 10 Oct 2011 08:11:04 +0200 Subject: pcm_{mix,volume}: pass only sample_format to pcm_mix() The other audio_format attributes are not used. --- src/output_thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/output_thread.c') 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; -- cgit v1.2.3