diff options
| author | Kevin Mitchell <kevmitch@gmail.com> | 2017-07-09 15:19:50 -0700 |
|---|---|---|
| committer | Kevin Mitchell <kevmitch@gmail.com> | 2017-07-10 21:01:39 -0700 |
| commit | 4389ddcc349dca38309e7597274a6b7e4c8301e8 (patch) | |
| tree | 1834d004a6781129b2a6685603d4fa421f9ed66b /audio | |
| parent | 71cc28b804b13282029d0c0615b4d5c5e1d31e82 (diff) | |
| download | mpv-4389ddcc349dca38309e7597274a6b7e4c8301e8.tar.bz2 mpv-4389ddcc349dca38309e7597274a6b7e4c8301e8.tar.xz | |
ao_wasapi: don't repeat format negotiation on align hack
Even if it did return a different result, the bufferFrameCount from the align
hack would be wrong anyway.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/out/ao_wasapi_utils.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/audio/out/ao_wasapi_utils.c b/audio/out/ao_wasapi_utils.c index 8f5da03545..e00b763e8e 100644 --- a/audio/out/ao_wasapi_utils.c +++ b/audio/out/ao_wasapi_utils.c @@ -984,10 +984,13 @@ retry: EXIT_ON_ERROR(hr); } - MP_DBG(ao, "Probing formats\n"); - if (!find_formats(ao)) { - hr = E_FAIL; - EXIT_ON_ERROR(hr); + // In the event of an align hack, we've already done this. + if (!align_hack) { + MP_DBG(ao, "Probing formats\n"); + if (!find_formats(ao)) { + hr = E_FAIL; + EXIT_ON_ERROR(hr); + } } MP_DBG(ao, "Fixing format\n"); |