From 7077526ffbb95368f1a7cf05e9b3230e9488eb7e Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 26 Jul 2014 20:26:57 +0200 Subject: ao_null: never fail at initialization ao_null is used to stop autoprobing (if all AOs before fail to init). After it come things like ao_pcm, which should never be automatically selected. Remove a certain theoretically possible failure case, and force "some" fallback. --- audio/out/ao_null.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/out/ao_null.c b/audio/out/ao_null.c index 384343aaa1..2c93cc273b 100644 --- a/audio/out/ao_null.c +++ b/audio/out/ao_null.c @@ -90,7 +90,7 @@ static int init(struct ao *ao) struct mp_chmap_sel sel = {0}; mp_chmap_sel_add_any(&sel); if (!ao_chmap_sel_adjust(ao, &sel, &ao->channels)) - return -1; + mp_chmap_from_channels(&ao->channels, 2); priv->latency = priv->latency_sec * ao->samplerate; -- cgit v1.2.3