summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Kiviniemi <devel@johan.kiviniemi.name>2013-09-20 06:58:18 +0300
committerwm4 <wm4@nowhere>2013-09-20 21:33:32 +0200
commit568ab3672a16b4a89a775d2418eea1976ef02a21 (patch)
treec77ba0456c5f03428ba91e29e332341a5c0a3c8b
parent0dd66b8b2c833aabc59afc57403b3bd42ce07f0c (diff)
downloadmpv-568ab3672a16b4a89a775d2418eea1976ef02a21.tar.bz2
mpv-568ab3672a16b4a89a775d2418eea1976ef02a21.tar.xz
ao_pulse: bug fix: goto the correct error handler
Conflicts: audio/out/ao_pulse.c
-rw-r--r--audio/out/ao_pulse.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c
index 613c444aa9..590e8b79c8 100644
--- a/audio/out/ao_pulse.c
+++ b/audio/out/ao_pulse.c
@@ -299,11 +299,11 @@ static int init(struct ao *ao)
if (!pa_sample_spec_valid(&ss)) {
mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Invalid sample spec\n");
- goto fail;
+ goto unlock_and_fail;
}
if (!select_chmap(ao, &map))
- goto fail;
+ goto unlock_and_fail;
if (!(proplist = pa_proplist_new())) {
mp_msg(MSGT_AO, MSGL_ERR, "AO: [pulse] Failed to allocate proplist\n");