From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 942F54BA0E for ; Tue, 9 Jul 2024 14:47:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AE1C168DCD6; Tue, 9 Jul 2024 17:47:14 +0300 (EEST) Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F2EB68D4F6 for ; Tue, 9 Jul 2024 17:47:08 +0300 (EEST) Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-a77c0b42a8fso763020666b.1 for ; Tue, 09 Jul 2024 07:47:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720536427; x=1721141227; darn=ffmpeg.org; h=subject:date:from:to:message-id:from:to:cc:subject:date:message-id :reply-to; bh=M7Wf/DVyb7xi/PRIg5DCafyyQpmDgTK9H1bdElNTeJg=; b=AotruDn9HuN1EBoQZvsxP8RfVzYNZGKKq23WhCAB98+nRSRjIF5odTzHTDzeys0pnK 5Pz1NsZAMJc/eWVvaU5jpdMYr9UnWwZOXUOqyXOgWdL3IHiRAUJyeQRqJc77sTE786UY nt/RnfsmMLJLrKGgmYIM5WAnfClVO40yTIjvNL+T6DYZ55orS6p/WN8s67+tASfFKO7a 9YmJ/TF1D5+Hzmlu8ve1Bysto7Ws0IxJBSAhC+2sSsBIAaXXpY7VFp0qJvNdC3wcLme8 BfY+e4SPgL52qQr09yDGna76upyEnUhBv8IX8F9vR1R2NhBupx35cE//YdSsNnceK7JX y3HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720536427; x=1721141227; h=subject:date:from:to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M7Wf/DVyb7xi/PRIg5DCafyyQpmDgTK9H1bdElNTeJg=; b=BO4zLZdAglfuF1nKh9W7WJ2Gl4vHBQRNz5tiwzVbYvZ/euwc9GWEfIA494Q1I5XLcq 2+BPgDBHLwlc9dQitcHJBRhstixveQwdulGb7jJ9bMnhASO0yBoO4iDOoCzFcjOp9tjF 8YtpNLnThV7dHiI0Bqw/rYVPyf4dMK64HPzm9OZNW9x/zTHPzPn7gcYBeVdRQfORP5GH 1VhnVi35dnGc/DiMTFFMCZgTYZ3/L/jZmJyihKS+lkZdLJ/uUqNG2rwn2Cgyfp6aFtf+ krqpliKzZPvTJUTv5EWvw7x2qCuFryjaL6EhUqw527kP8GZhkGjWMGY3hPrcyHxxxwlH O/dQ== X-Gm-Message-State: AOJu0YxzBY7pL9WUzv8fkJqkU54NUsUxarFimgoLqZrUV0J5pP1WM+s7 UJpNJLYIDycfzSLTIS7hj/lvyhET7l4UQIzoF/OCIPuB3Bw36xPONGLDdA== X-Google-Smtp-Source: AGHT+IHzXId3+mWKMkq9Tt3XUHkWO+gLSEFIS1HXS/kNdY8QApgA3ejA1UkNhCr1ipi5Krk0XsYALw== X-Received: by 2002:a17:906:3944:b0:a72:5f3f:27a2 with SMTP id a640c23a62f3a-a780d28ad56mr194667066b.26.1720536427138; Tue, 09 Jul 2024 07:47:07 -0700 (PDT) Received: from localhost (p200300cccf0d6b00d0111f470a9532c8.dip0.t-ipconnect.de. [2003:cc:cf0d:6b00:d011:1f47:a95:32c8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a854a27sm82460666b.162.2024.07.09.07.47.06 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 09 Jul 2024 07:47:06 -0700 (PDT) Message-Id: To: From: "Marvin Scholz" Date: Tue, 9 Jul 2024 16:46:47 +0200 Subject: [FFmpeg-devel] [PATCH] avutil/hwcontext_videotoolbox: Fix build with older SDKs X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: I've accidentally used API not available on the checked version. Additionally check for the SDK to be new enough to even have the CVImageBufferCreateColorSpaceFromAttachments API to not fail the build. --- libavutil/hwcontext_videotoolbox.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c index 953155ce32..ab7556936d 100644 --- a/libavutil/hwcontext_videotoolbox.c +++ b/libavutil/hwcontext_videotoolbox.c @@ -588,13 +588,26 @@ static int vt_pixbuf_set_colorspace(void *log_ctx, } else CVBufferRemoveAttachment(pixbuf, kCVImageBufferGammaLevelKey); +#if (TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED >= 100800) || \ + (TARGET_OS_IOS && __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000) if (__builtin_available(macOS 10.8, iOS 10, *)) { - CFDictionaryRef attachments = CVBufferCopyAttachments(pixbuf, kCVAttachmentMode_ShouldPropagate); + CFDictionaryRef attachments = NULL; + if (__builtin_available(macOS 12.0, iOS 15.0, *)) + attachments = CVBufferCopyAttachments(pixbuf, kCVAttachmentMode_ShouldPropagate); +#if (TARGET_OS_OSX && __MAC_OS_X_VERSION_MIN_REQUIRED <= 120000) || \ + (TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED <= 150000) + else { + CFDictionaryRef tmp = CVBufferGetAttachments(pixbuf, kCVAttachmentMode_ShouldPropagate); + if (tmp) + attachments = CFDictionaryCreateCopy(NULL, tmp); + } +#endif if (attachments) { colorspace = CVImageBufferCreateColorSpaceFromAttachments(attachments); CFRelease(attachments); } } +#endif if (colorspace) { CVBufferSetAttachment(pixbuf, kCVImageBufferCGColorSpaceKey, base-commit: 9fb8d13d56f20728141fd7070d8a325720727d57 -- 2.39.3 (Apple Git-146) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".