diff options
Diffstat (limited to 'src/output_thread.c')
| -rw-r--r-- | src/output_thread.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/output_thread.c b/src/output_thread.c index e6b815ce0..02c315af9 100644 --- a/src/output_thread.c +++ b/src/output_thread.c @@ -401,8 +401,12 @@ 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.format, - 1.0 - chunk->mix_ratio); + if (!pcm_mix(dest, data, length, ao->in_audio_format.format, + 1.0 - chunk->mix_ratio)) { + g_warning("Cannot cross-fade format %s", + sample_format_to_string(ao->in_audio_format.format)); + return NULL; + } data = dest; length = other_length; |