From f0488edf2b3bc2874deb077879523becba7d0d10 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 27 Jul 2012 01:52:07 +0100 Subject: Clean up channels coming from ffmpeg wrt those thought to be the case. --- src/lib/ffmpeg_decoder.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/lib/ffmpeg_decoder.cc') 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); } } -- cgit v1.2.3