summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-07-27 01:52:07 +0100
committerCarl Hetherington <cth@carlh.net>2012-07-27 01:52:07 +0100
commitf0488edf2b3bc2874deb077879523becba7d0d10 (patch)
treececcd80049ce4cd309e6ba1518cf202314dd82f9 /src/lib/ffmpeg_decoder.cc
parentb15e972e14ba5ad2863cb878fa02409eb87a41f8 (diff)
Clean up channels coming from ffmpeg wrt those thought to be the case.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
-rw-r--r--src/lib/ffmpeg_decoder.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index df7434ff8..d2a10be1f 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -172,7 +172,8 @@ FFmpegDecoder::do_pass ()
0, _audio_codec_context->channels, _frame->nb_samples, audio_sample_format (), 1
);
- process_audio (_frame->data[0], _audio_codec_context->channels, data_size);
+ assert (_audio_codec_context->channels == _fs->audio_channels);
+ process_audio (_frame->data[0], data_size);
}
}