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 B12584BC90 for ; Tue, 16 Jul 2024 12:12:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20AF168D903; Tue, 16 Jul 2024 15:12:22 +0300 (EEST) Received: from out203-205-221-240.mail.qq.com (out203-205-221-240.mail.qq.com [203.205.221.240]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99E4368AE97 for ; Tue, 16 Jul 2024 15:12:14 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1721131930; bh=ptHmfehD31Yzir4Y0EAVdo3AUFdMg59NxwQ30vpNt/0=; h=From:Subject:Date:References:To:In-Reply-To; b=O07AkgXXlX01fBgR70zUsXckB7LyNhlecnZAsUQvArDblo9aedjXeKC7iiVjJ8OQD 3z8klQPQAU3pS++AwlO+EVH31VfX7tz5ZBiw3jxb/J1rzdCUC24J02sJInig+Vy9tY mQJmFms8tCn7JWMWkyXriDoiVh3zbj5yG61viuNI= Received: from smtpclient.apple ([119.147.10.189]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id 3093FAE5; Tue, 16 Jul 2024 20:12:09 +0800 X-QQ-mid: xmsmtpt1721131929to4s11754 Message-ID: X-QQ-XMAILINFO: N7h1OCCDntujZaA3wUFeZ0BiFECd+QAJZCiDLenpa0TBpQqV2/R7OCwrhureP7 7x8udo26b0CnXEwp12W5qYzca2GW2rhRl6/D2AvVjpLEIITg+DaO2A98C4isBlu1gKp1Fbk0PZgM rldbgaB+ROFXNlUqf1WASqlcd1hcisWN58dB4Iehcz3HtROHxNdwBZyYTDn4Y+jkLyzd4ep9I/Mn /IdqDiWbtkG96K62AKAyTG93ZJmTCgJ0ZvaF7tcjorIJUYYbzBx0nL+IsJwqF+tusiSUzjr+m4Yi W6JsgWwGuVf6L80H5UUV3vIQg4j9p/VhyPpj0nC5d1529E1CUNSh/U2N45Nb4RAroXUMM1bPsvAn bL5qXqpuNCKVy6C8RVgbl+NZMUCdb6LEpgoSLcOBu3xHjGLDwFQGMECZLoeoV9LIR253JhyGJoS1 kc2NGA8UwyRPCljzJRIKvn0XTlugmLeN01zZWh8wpoF5IxO5+FaQxVlpTeG2bd/Nq+6K7qUjGRBr LuJgqfOaK9fmYqHfzx+bsuAtXP59NbM+ifiM3QoffBA/AOt80zmqThjt9hQC8J0Y6QMYc64bJUAm stZdoIi3j5pJJJ08xrxt+4DyflARpvDFH3O3gIIqz24Hu+CGnD8B5LYtLpwEzhABqP6ylSGXqzW3 rTLn/CUCWAV4Lcs/SjSk5dNTzFv1wBSUksBxRlIgeNC8qqcJhUSbmvXxWW7oo/0dx8X6OUkfUmae hKGj8VaZG1jY+7lCrK9ibqERurX7eCH9jat+31IgrAYip3tNFj4mH/PK65H8iAs8I/IRAln+nuyo BFZ7kCp2YTjzBx+nJls7rxzErKOUYfN9VGDJ4+Y2xF0Un7icNlRniC5uiYUV1lPfcG4X25YTieI4 wweRNo0VH2ui+5A4hba+gfjRlmKAoUe6XAGtFUa1wvzm842p/N2R+mvHmxYQ9Zcnid+SeQeWO1fK RkkXMC0wnIyKmtFcV0l8qtkK/WRRNx/KI+1U/Ow1avgGU/Vyh1XAjUwAhaMItE X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= From: Zhao Zhili Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.500.171.1.1\)) Date: Tue, 16 Jul 2024 20:11:59 +0800 References: To: FFmpeg development discussions and patches In-Reply-To: X-OQ-MSGID: <83555678-3558-452C-B520-A11CA4C55CD5@foxmail.com> X-Mailer: Apple Mail (2.3774.500.171.1.1) Subject: Re: [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 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: > On Jul 9, 2024, at 22:46, Marvin Scholz wrote: > > 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, Rebase and applied, thanks. > > 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". _______________________________________________ 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".