X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.cc;h=a9e01908c4782a6095821d080800b0568ce71214;hb=50cb31af16240b248700dab1484d7f07656c66df;hp=bbd4ced6c1a2c114f337729f8fe609f71e1eb353;hpb=a0856e3fbef17f24073b01cb96be6bbcb229ecbc;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index bbd4ced6c..a9e01908c 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -59,10 +59,10 @@ AudioDecoder::AudioDecoder (shared_ptr<const Film> f, shared_ptr<const AudioCont
 
 		_swr_context = swr_alloc_set_opts (
 			0,
-			av_get_default_channel_layout (MAX_AUDIO_CHANNELS),
+			av_get_default_channel_layout (_audio_content->audio_channels ()),
 			AV_SAMPLE_FMT_FLTP,
 			_audio_content->output_audio_frame_rate(),
-			av_get_default_channel_layout (MAX_AUDIO_CHANNELS),
+			av_get_default_channel_layout (_audio_content->audio_channels ()),
 			AV_SAMPLE_FMT_FLTP,
 			_audio_content->content_audio_frame_rate(),
 			0, 0
@@ -152,7 +152,6 @@ AudioDecoder::audio (shared_ptr<const AudioBuffers> data, Time time)
 	}
 
 	Audio (dcp_mapped, time);
-	cout << "bumping n.a. by " << data->frames() << " ie " << film->audio_frames_to_time(data->frames()) << "\n";
 	_next_audio = time + film->audio_frames_to_time (data->frames());
 }