summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-07-26 20:26:57 +0200
committerwm4 <wm4@nowhere>2014-07-26 20:26:57 +0200
commit7077526ffbb95368f1a7cf05e9b3230e9488eb7e (patch)
tree15e9ec4fe5d13ab3fc39d110828a404a477c6eb3
parentac6224498374906fad8ec7b026f7e9442c9224c5 (diff)
downloadmpv-7077526ffbb95368f1a7cf05e9b3230e9488eb7e.tar.bz2
mpv-7077526ffbb95368f1a7cf05e9b3230e9488eb7e.tar.xz
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.
-rw-r--r--audio/out/ao_null.c2
1 files changed, 1 insertions, 1 deletions
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;