diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-06-25 02:25:44 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-06-25 02:25:44 +0200 |
| commit | ad56f2c46ac6deec86870ec10f2a11a644df07d4 (patch) | |
| tree | 89f2d90c5586560911e67c872b530c77f151168d /audio/out/ao_wasapi.c | |
| parent | 0536841647ef7931bffb4386d8ffbb5b2b568e8a (diff) | |
| parent | 393bb2a565dc1e27812e1dd20747814892f80da2 (diff) | |
| download | mpv-ad56f2c46ac6deec86870ec10f2a11a644df07d4.tar.bz2 mpv-ad56f2c46ac6deec86870ec10f2a11a644df07d4.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'audio/out/ao_wasapi.c')
| -rw-r--r-- | audio/out/ao_wasapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c index eecfded9e1..ae6bd3d9dc 100644 --- a/audio/out/ao_wasapi.c +++ b/audio/out/ao_wasapi.c @@ -270,7 +270,7 @@ static void uninit(struct ao *ao) static int init(struct ao *ao) { MP_DBG(ao, "Init wasapi\n"); - CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_MULTITHREADED); struct wasapi_state *state = ao->priv; state->log = ao->log; @@ -469,7 +469,7 @@ static int hotplug_init(struct ao *ao) MP_DBG(ao, "Hotplug init\n"); struct wasapi_state *state = ao->priv; state->log = ao->log; - CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_MULTITHREADED); HRESULT hr = wasapi_change_init(ao, true); EXIT_ON_ERROR(hr); |