diff options
author | wm4 <wm4@nowhere> | 2014-03-10 02:09:18 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-03-10 02:09:18 +0100 |
commit | 249789c256ddffb6fc6eaf628b2653c195dcdac8 (patch) | |
tree | b9f1d222f98eecf9f864782215ecd9b9223eacf1 /player/audio.c | |
parent | 378a15564c1203aea0c3076581c666863228c7f2 (diff) | |
download | mpv-249789c256ddffb6fc6eaf628b2653c195dcdac8.tar.bz2 mpv-249789c256ddffb6fc6eaf628b2653c195dcdac8.tar.xz |
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.
Diffstat (limited to 'player/audio.c')
-rw-r--r-- | player/audio.c | 7 |
1 files changed, 1 insertions, 6 deletions
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 |