aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-02-26 21:02:39 +0100
committerMax Kellermann <max@duempel.org>2009-02-26 21:02:39 +0100
commita7b0cfccb45b56f493e3ce6fb38e6b23b14518ee (patch)
treeb1ea1d49c4c08fbb9dd0e0da088407b9826863eb
parentbcc3a9debfc60e7c18fe70388482ed697962eb80 (diff)
downloadmpd-a7b0cfccb45b56f493e3ce6fb38e6b23b14518ee.tar.gz
mpd-a7b0cfccb45b56f493e3ce6fb38e6b23b14518ee.tar.xz
mpd-a7b0cfccb45b56f493e3ce6fb38e6b23b14518ee.zip
output_thread: use the right audio_format in assert()
ao_play() gets PCM data in the in_audio_format, and converts it to out_audio_format. Comparing the input data with out_audio_format is wrong. prefixed with "STG:" will be automatically removed. STG: Trailing empty lines will be automatically removed. STG: vi: set textwidth=75 filetype=diff nobackup:
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 2640adfbd..91fd8d406 100644
--- a/src/output_thread.c
+++ b/src/output_thread.c
@@ -58,7 +58,7 @@ static void ao_play(struct audio_output *ao)
size_t size = ao->args.play.size;
assert(size > 0);
- assert(size % audio_format_frame_size(&ao->out_audio_format) == 0);
+ assert(size % audio_format_frame_size(&ao->in_audio_format) == 0);
if (!audio_format_equals(&ao->in_audio_format, &ao->out_audio_format)) {
data = pcm_convert(&ao->convert_state,