From 071a8f50b96758ced05e1eef3aba5ce915a56479 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 31 Mar 2013 04:24:53 +0200
Subject: options: add option to prevent decoder audio downmixing

Also rename --a52drc to --ad-lavc-ac3drc, and add --ad-lavc-o.
---
 core/mplayer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/mplayer.c')

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;
-- 
cgit v1.2.3