[vlc-commits] videotoolbox: Do not guard symbols for macOS 10.11 / iOS 9 anymore

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Wed Oct  3 15:54:09 2018 +0200| [4109609d27ad36eb2445766c5f973915c0bff2a8] | committer: David Fuhrmann

videotoolbox: Do not guard symbols for macOS 10.11 / iOS 9 anymore

As this is the minimum supported version nowadays.

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

 modules/codec/videotoolbox.m | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.m
index 407c1d8104..ab94598b85 100644
--- a/modules/codec/videotoolbox.m
+++ b/modules/codec/videotoolbox.m
@@ -61,12 +61,6 @@
 
 #endif
 
-// Define stuff for older SDKs
-#if (TARGET_OS_OSX && MAC_OS_X_VERSION_MAX_ALLOWED < 101100) || \
-    (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED < 90000) || \
-    (TARGET_OS_TV && __TV_OS_VERSION_MAX_ALLOWED < 90000)
-enum { kCMVideoCodecType_HEVC = 'hvc1' };
-#endif
 
 #if (!TARGET_OS_OSX || MAC_OS_X_VERSION_MAX_ALLOWED < 1090)
 const CFStringRef kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder = CFSTR("EnableHardwareAcceleratedVideoDecoder");
@@ -1134,15 +1128,8 @@ static CFMutableDictionaryRef CreateSessionDescriptionFormat(decoder_t *p_dec,
             yuvmatrix = kCVImageBufferYCbCrMatrix_ITU_R_601_4;
             break;
         case COLOR_SPACE_BT2020:
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpartial-availability"
-            if (&kCVImageBufferColorPrimaries_ITU_R_2020 != nil)
-            {
-                yuvmatrix = kCVImageBufferColorPrimaries_ITU_R_2020;
-                break;
-            }
-#pragma clang diagnostic pop
-            /* fall through */
+            yuvmatrix = kCVImageBufferColorPrimaries_ITU_R_2020;
+            break;
         case COLOR_SPACE_BT709:
         default:
             yuvmatrix = kCVImageBufferColorPrimaries_ITU_R_709_2;