From 249789c256ddffb6fc6eaf628b2653c195dcdac8 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 10 Mar 2014 02:09:18 +0100 Subject: audio: make --channels option always force the output layout Use the --channels value directly on the AO, instead of doing it only in the --channels=stereo (default) case and if the decoder output is not stereo. --- player/audio.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'player') diff --git a/player/audio.c b/player/audio.c index 5d8d60ccd1..bbe4174890 100644 --- a/player/audio.c +++ b/player/audio.c @@ -143,12 +143,7 @@ void reinit_audio_chain(struct MPContext *mpctx) ao_format = out_format.format; ao_channels = out_format.channels; } else { - // Automatic downmix - if (mp_chmap_is_stereo(&opts->audio_output_channels) && - !mp_chmap_is_stereo(&in_format.channels)) - { - mp_chmap_from_channels(&ao_channels, 2); - } + ao_channels = opts->audio_output_channels; // automatic downmix } // Determine what the filter chain outputs. build_afilter_chain() also -- cgit v1.2.3