summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Mitchell <kevmitch@gmail.com>2014-11-18 07:54:26 -0800
committerKevin Mitchell <kevmitch@gmail.com>2014-11-18 07:54:26 -0800
commit71095be5b0ed574c35016301c3b94fc7ec149f04 (patch)
tree4d640972f761c8d3ace0d26eea09cdd836744c1f
parentb8ac594af0cb2c0bfbf9a6f8b4571cf308a69a0f (diff)
parentf2dda72dbc1e8047fffcd1bc3e93f386cc81a741 (diff)
downloadmpv-71095be5b0ed574c35016301c3b94fc7ec149f04.tar.bz2
mpv-71095be5b0ed574c35016301c3b94fc7ec149f04.tar.xz
ao/wasapi: actually only retry once (not twice)
oops
-rwxr-xr-xaudio/out/ao_wasapi_utils.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/audio/out/ao_wasapi_utils.c b/audio/out/ao_wasapi_utils.c
index 7923f3cb56..6db77bc4ec 100755
--- a/audio/out/ao_wasapi_utils.c
+++ b/audio/out/ao_wasapi_utils.c
@@ -471,7 +471,6 @@ static HRESULT fix_format(struct ao *ao)
/* hopefully this shouldn't happen because of the above integer device period */
/* http://msdn.microsoft.com/en-us/library/windows/desktop/dd370875%28v=vs.85%29.aspx */
int retries=0;
-
reinit:
MP_DBG(state, "IAudioClient::Initialize\n");
hr = IAudioClient_Initialize(state->pAudioClient,
@@ -485,7 +484,7 @@ reinit:
if (hr == AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED) {
MP_VERBOSE(state, "IAudioClient::Initialize negotiation failed with %s (0x%"PRIx32"), used %lld * 100ns\n",
wasapi_explain_err(hr), (uint32_t)hr, bufferDuration);
- if (retries > 1) {
+ if (retries > 0) {
hr = E_FAIL;
EXIT_ON_ERROR(hr);
} else {