summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-23 16:25:12 +0100
committerwm4 <wm4@nowhere>2015-02-23 16:25:12 +0100
commit636d6d724d36b90812a0c145bbf40143be9a52e8 (patch)
tree8fe8025e82a5bb67173b70c5f90576c060488d3d /player
parent24e72801788760ac4e3c998517717fd075ecd64c (diff)
downloadmpv-636d6d724d36b90812a0c145bbf40143be9a52e8.tar.bz2
mpv-636d6d724d36b90812a0c145bbf40143be9a52e8.tar.xz
encoding: allow encoding to channel configurations other than stereo
A while ago, we made mpv output the native number of channels by default, instead of stereo. I assumed this was not wanted for encode mode. This commit keeps the assumption, but allows setting the number of audio output channels at all, instead of always forcing stereo. (Pretty much a hack.)
Diffstat (limited to 'player')
-rw-r--r--player/main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/player/main.c b/player/main.c
index 98c5861f13..dbd969ecef 100644
--- a/player/main.c
+++ b/player/main.c
@@ -408,7 +408,9 @@ int mp_initialize(struct MPContext *mpctx)
m_config_set_option0(mpctx->mconfig, "load-scripts", "no");
m_config_set_option0(mpctx->mconfig, "osc", "no");
m_config_set_option0(mpctx->mconfig, "framedrop", "no");
- m_config_set_option0(mpctx->mconfig, "audio-channels", "stereo");
+ // never use auto
+ if (!opts->audio_output_channels.num)
+ m_config_set_option0(mpctx->mconfig, "audio-channels", "stereo");
mp_input_enable_section(mpctx->input, "encode", MP_INPUT_EXCLUSIVE);
}
#endif