summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-11-07 15:20:34 +0100
committerwm4 <wm4@nowhere>2015-11-07 15:20:34 +0100
commita7f51f8fd48df7f04f47b515180338f8b9b78fed (patch)
tree3951ef1f22d44526a68b7b16ee3803ef5c31bc4a /audio
parent5a7c22a1ac4561aab90f316ee394aa269fb75408 (diff)
downloadmpv-a7f51f8fd48df7f04f47b515180338f8b9b78fed.tar.bz2
mpv-a7f51f8fd48df7f04f47b515180338f8b9b78fed.tar.xz
ao_jack: remove "alsa" std-channel-layout choice
Same deal as with previous commit. "waveext" is less arbitrary and at least supports 3/7 channels.
Diffstat (limited to 'audio')
-rw-r--r--audio/out/ao_jack.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c
index 04e5c71b4a..41ccfae614 100644
--- a/audio/out/ao_jack.c
+++ b/audio/out/ao_jack.c
@@ -162,10 +162,6 @@ static int init(struct ao *ao)
mp_chmap_sel_add_waveext(&sel);
break;
- case 1:
- mp_chmap_sel_add_alsa_def(&sel);
- break;
-
default:
mp_chmap_sel_add_any(&sel);
}
@@ -236,7 +232,7 @@ const struct ao_driver audio_out_jack = {
OPT_FLAG("autostart", autostart, 0),
OPT_FLAG("connect", connect, 0),
OPT_CHOICE("std-channel-layout", stdlayout, 0,
- ({"waveext", 0}, {"alsa", 1}, {"any", 2})),
+ ({"waveext", 0}, {"any", 1})),
{0}
},
};