[vlc-commits] avcapture: Only redeclare function if it does not exist in sdk

David Fuhrmann git at videolan.org
Sat Oct 27 17:49:10 CEST 2018


vlc/vlc-3.0 | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sun Oct 21 21:32:39 2018 +0200| [b29e7b9256f0a3692e6110a3a66f2ba2a7fee86e] | committer: David Fuhrmann

avcapture: Only redeclare function if it does not exist in sdk

(cherry picked from commit 0f50cd8dcf33a28cead0aae835ecf9a270d461f6)
Signed-off-by: David Fuhrmann <dfuhrmann at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=b29e7b9256f0a3692e6110a3a66f2ba2a7fee86e
---

 modules/access/avcapture.m | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/access/avcapture.m b/modules/access/avcapture.m
index b4fee4277d..38777226cf 100644
--- a/modules/access/avcapture.m
+++ b/modules/access/avcapture.m
@@ -39,14 +39,17 @@
 #include <vlc_dialog.h>
 #include <vlc_access.h>
 
+#import <AvailabilityMacros.h>
 #import <AVFoundation/AVFoundation.h>
 #import <CoreMedia/CoreMedia.h>
 
+#ifndef MAC_OS_X_VERSION_10_14
 @interface AVCaptureDevice (AVCaptureDeviceAuthorizationSince10_14)
 
 + (void)requestAccessForMediaType:(AVMediaType)mediaType completionHandler:(void (^)(BOOL granted))handler API_AVAILABLE(macos(10.14), ios(7.0));
 
 @end
+#endif
 
 /*****************************************************************************
 * Local prototypes



More information about the vlc-commits mailing list