From 1e1045b13ea4acbbd77dd52c4e0599f1517e6ac3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 6 May 2015 18:51:31 +0200 Subject: ao_coreaudio_exclusive: explicitly check for spdif formats --- audio/out/ao_coreaudio_exclusive.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'audio') diff --git a/audio/out/ao_coreaudio_exclusive.c b/audio/out/ao_coreaudio_exclusive.c index 492e0189f9..e1108773aa 100644 --- a/audio/out/ao_coreaudio_exclusive.c +++ b/audio/out/ao_coreaudio_exclusive.c @@ -382,18 +382,15 @@ static int init(struct ao *ao) ao->format = af_fmt_from_planar(ao->format); - bool supports_digital = false; - /* Probe whether device support S/PDIF stream output if input is AC3 stream, - * or anything else IEC61937-framed. */ - if (AF_FORMAT_IS_IEC61937(ao->format)) { - if (ca_device_supports_digital(ao, p->device)) - supports_digital = true; + if (!AF_FORMAT_IS_IEC61937(ao->format)) { + MP_ERR(ao, "Only compressed formats are supported.\n"); + goto coreaudio_error_nounlock; } - if (!supports_digital) { + if (!ca_device_supports_digital(ao, p->device)) { MP_ERR(ao, "selected device doesn't support digital formats\n"); goto coreaudio_error_nounlock; - } // closes if (!supports_digital) + } // Build ASBD for the input format AudioStreamBasicDescription asbd; -- cgit v1.2.3