From 84750f2f2a344567be1344459d4e83fb9cbda6d5 Mon Sep 17 00:00:00 2001 From: Anthony Nicholls Date: Tue, 26 Sep 2023 16:07:21 +0100 Subject: [PATCH] juce_video: Prevent a runtime crash when LTO is enabled on macOS versions < 14.0 --- modules/juce_video/native/juce_CameraDevice_mac.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/modules/juce_video/native/juce_CameraDevice_mac.h b/modules/juce_video/native/juce_CameraDevice_mac.h index 6da9945b23..659f0b1ac0 100644 --- a/modules/juce_video/native/juce_CameraDevice_mac.h +++ b/modules/juce_video/native/juce_CameraDevice_mac.h @@ -146,17 +146,9 @@ struct CameraDevice::Pimpl #if JUCE_USE_NEW_CAMERA_API if (@available (macOS 10.15, *)) { - const auto deviceType = [&] - { - #if defined (MAC_OS_VERSION_14_0) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_14_0 - if (@available (macOS 14.0, *)) - return AVCaptureDeviceTypeExternal; - #endif - - JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations", "-Wunguarded-availability-new") - return AVCaptureDeviceTypeExternalUnknown; - JUCE_END_IGNORE_WARNINGS_GCC_LIKE - }(); + JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations") + const auto deviceType = AVCaptureDeviceTypeExternalUnknown; + JUCE_END_IGNORE_WARNINGS_GCC_LIKE auto* discovery = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes: @[AVCaptureDeviceTypeBuiltInWideAngleCamera, deviceType] mediaType: AVMediaTypeVideo