summaryrefslogtreecommitdiffstats
path: root/core/mplayer.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-03-31 04:24:53 +0200
committerwm4 <wm4@nowhere>2013-04-13 04:21:30 +0200
commit071a8f50b96758ced05e1eef3aba5ce915a56479 (patch)
treeea1541a6d08d3a9c98f515a8c9c6b8b96ff2f929 /core/mplayer.c
parent0d939a6847b139a29aaa21bd0b73d5fa28c6fb03 (diff)
downloadmpv-071a8f50b96758ced05e1eef3aba5ce915a56479.tar.bz2
mpv-071a8f50b96758ced05e1eef3aba5ce915a56479.tar.xz
options: add option to prevent decoder audio downmixing
Also rename --a52drc to --ad-lavc-ac3drc, and add --ad-lavc-o.
Diffstat (limited to 'core/mplayer.c')
-rw-r--r--core/mplayer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/mplayer.c b/core/mplayer.c
index 7023b6f8f8..64c8e9555d 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -1562,8 +1562,8 @@ void reinit_audio_chain(struct MPContext *mpctx)
mpctx->ao = ao_create(opts, mpctx->input);
mpctx->ao->samplerate = opts->force_srate;
mpctx->ao->format = opts->audio_output_format;
- if (mpctx->sh_audio->channels != opts->audio_output_channels &&
- opts->audio_output_channels == 2)
+ // Automatic downmix
+ if (opts->audio_output_channels == 2 && mpctx->sh_audio->channels != 2)
mpctx->ao->channels = 2;
}
ao = mpctx->ao;