From d40c0d4f9006b4195a5509ae182e377ae88d16f6 Mon Sep 17 00:00:00 2001
From: Kevin Mitchell <kevmitch@gmail.com>
Date: Thu, 27 Nov 2014 18:44:06 -0800
Subject: ao/wasapi: fix unmatched CoUninitialize() on init failure

---
 audio/out/ao_wasapi.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'audio/out/ao_wasapi.c')

diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c
index 8477a9cb51..30767549fd 100644
--- a/audio/out/ao_wasapi.c
+++ b/audio/out/ao_wasapi.c
@@ -195,12 +195,15 @@ static void uninit(struct ao *ao)
     if (state->VistaBlob.hAvrt)
         FreeLibrary(state->VistaBlob.hAvrt);
     closehandles(ao);
+    CoUninitialize();
     MP_DBG(ao, "Uninit wasapi done\n");
 }
 
 static int init(struct ao *ao)
 {
     MP_DBG(ao, "Init wasapi\n");
+    CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+
     ao->format = af_fmt_from_planar(ao->format);
     struct mp_chmap_sel sel = {0};
     mp_chmap_sel_add_waveext(&sel);
@@ -356,7 +359,9 @@ static void audio_resume(struct ao *ao)
 
 static void list_devs(struct ao *ao, struct ao_device_list *list)
 {
+    CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
     wasapi_enumerate_devices(mp_null_log, ao, list);
+    CoUninitialize();
 }
 
 #define OPT_BASE_STRUCT struct wasapi_state
-- 
cgit v1.2.3