summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-27 20:03:36 +0100
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-01-25 17:00:10 +0900
commitb4174ab4e9f08c0a32293a3a4f98b2483b749778 (patch)
tree9bb499ad1d3b93ae179ecfe21ed5984a7a5a535b
parentce5f0f1a7ad00b2242277b757b3c6d9e5d595998 (diff)
downloadmpv-b4174ab4e9f08c0a32293a3a4f98b2483b749778.tar.bz2
mpv-b4174ab4e9f08c0a32293a3a4f98b2483b749778.tar.xz
ao_wasapi: don't treat SetDisplayName() failure as fatal
Same for SetIconPath().
-rwxr-xr-xaudio/out/ao_wasapi_utils.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/audio/out/ao_wasapi_utils.c b/audio/out/ao_wasapi_utils.c
index 6db77bc4ec..7b37ef19b0 100755
--- a/audio/out/ao_wasapi_utils.c
+++ b/audio/out/ao_wasapi_utils.c
@@ -449,7 +449,8 @@ static HRESULT init_session_display(struct wasapi_state *state) {
exit_label:
MP_ERR(state, "Error setting audio session display name: %s (0x%"PRIx32")\n",
wasapi_explain_err(hr), (uint32_t)hr);
- return hr;
+ // No reason to abort initialization.
+ return S_OK;
}
static HRESULT fix_format(struct ao *ao)