From 50b36ef8236cefee5f7869811cad02ef3a670323 Mon Sep 17 00:00:00 2001 From: Misha Klatis Date: Fri, 8 Mar 2024 10:22:54 -0800 Subject: [PATCH] ios build fixes --- modules/videoio/src/cap_avfoundation.mm | 4 ++-- platforms/ios/Info.Dynamic.plist.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/videoio/src/cap_avfoundation.mm b/modules/videoio/src/cap_avfoundation.mm index d0f2b41c37..0853e57255 100644 --- a/modules/videoio/src/cap_avfoundation.mm +++ b/modules/videoio/src/cap_avfoundation.mm @@ -824,7 +824,7 @@ CvCaptureFile::CvCaptureFile(const char* filename) { // Available since iOS 15 #if TARGET_OS_VISION || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) - if (@available(iOS 15, visionOS 1, *)) { + if (@available(iOS 15, *)) { [mAsset loadTracksWithMediaType:AVMediaTypeVideo completionHandler:^(NSArray* tracks, NSError* err) { if (err != nil) { handleTracks(tracks, filename); @@ -1311,7 +1311,7 @@ CvVideoWriter_AVFoundation::CvVideoWriter_AVFoundation(const char* filename, int #if TARGET_OS_VISION || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) }else if(fourcc == CV_FOURCC('H','2','6','5') || fourcc == CV_FOURCC('h','v','c','1') || fourcc == CV_FOURCC('H','E','V','C') || fourcc == CV_FOURCC('h','e','v','c')){ - if (@available(iOS 11, visionOS 1, *)) { + if (@available(iOS 11, *)) { codec = [AVVideoCodecTypeHEVC copy]; } else { codec = [AVVideoCodecTypeH264 copy]; diff --git a/platforms/ios/Info.Dynamic.plist.in b/platforms/ios/Info.Dynamic.plist.in index e48fffdb9d..ce41a52d5b 100644 --- a/platforms/ios/Info.Dynamic.plist.in +++ b/platforms/ios/Info.Dynamic.plist.in @@ -23,7 +23,7 @@ iPhoneOS MinimumOSVersion - 8.0 + ${IPHONEOS_DEPLOYMENT_TARGET} UIDeviceFamily 1