From patchwork Thu Dec 2 14:53:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31886 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp187744iog; Thu, 2 Dec 2021 06:53:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJxdOZ1Dpc2bx8Zb3NG01P3cPk3Svhu1HFdTqgw9RPyRR7aRddK2HLcmNd3bqKiHZXkXiECi X-Received: by 2002:a17:907:3e0a:: with SMTP id hp10mr16246959ejc.318.1638456833358; Thu, 02 Dec 2021 06:53:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638456833; cv=none; d=google.com; s=arc-20160816; b=toqg9I0OT3D5k9DrD5XzPv5TCltupxXJKkeQgBeMnVp/r2IOOPD+qpLg/d7yskkhxQ Pu6/Q7MUokPKTPNW5VCbExOtkn6kkDppNHb1Z6JiJLo513tyciay9047RNw379KX9HLv eNXYpkZN6eXfLtWa7U9cr0PaO7vSNFRGBwMA1wSerd18eflX0Hp0JXPbjM49mRV4YLDH KD+tAcpgntSsapEOSvaTQEcnAgawTBNdrLDgn6Ls4bS+Cc4KGmgcre5nf2Tv6r05a91O 30qQGMnaKGck62ZPOYq/9ChrHTQs7uMf3kU3VFTTe8VJP1G5mlBer0nhRkYTv46eVKIA yREQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=jBvk4zMnN7+huo0HkK7ZKyt6ZHsrUemcj1Q1mVNSUiI=; b=WfAMo7FwJIIMTHGMu5745WF6ZDeLRIhsYSiqLX/GpA7UUkSXnk/Ch8ehTjWrCQmk9c tpXkW6iv/fURJ2ikxIM7MTiLEFhw17u3SZkOHI68Txtno/cTjadHB6WvVRob4Q7fcTnR E2faidlzQ5YsbC53iYEYJyjyKxYRJ01dcGRZIgHDjdhc7Le4hBTc09CfeQTXQMuTGzNc HhqaiUpuNTMTX8Vb4kLknbuqlNYdP0aqS8jV0JxIyM1Kx8UmkeB0np/rx9XHsXwAMq9c ahtXVbtJbt2TFUXdBt5//8UsrMkwmLEagWSaILUG3o4f+FAQfdkLm9zPeiRG2RQqXqpJ pX+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=cOJIkEcU; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ds6si6826912ejc.197.2021.12.02.06.53.52; Thu, 02 Dec 2021 06:53:53 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=cOJIkEcU; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0210468AFAF; Thu, 2 Dec 2021 16:53:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D1A8568AE7A for ; Thu, 2 Dec 2021 16:53:43 +0200 (EET) Received: by mail-pg1-f173.google.com with SMTP id s37so17606558pga.9 for ; Thu, 02 Dec 2021 06:53:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hLGoZcm6S0InvzH1X/WzyIJO8YBOcZHC3Gr39Gr9Bck=; b=cOJIkEcUhjpINf57insT6M+SCzMuUzzzmNGkqUuWOhXXgsd2dhOHSkE+RC/vbiE7uI BU/o1ODW7G7G15dkiPV/EcQ4WnZ0An7k5MdUCNIUOeoLgjjV5EnC5lh9XxlWHLi63++G 0lxtrtXeH4zrF8MggVshM2tQyuZ6PSClkvR/AqIFwyEhtW/Znj9KDqgGX1zdb4k68kr6 uyJy58cphqTdf7p7gYdMBfiBouhpquwwAcYhOg6OBg1spZ3HZF/duUlJZEmXEwjxjbDR j8ZQI6Y7KhGs+NQmXI5ZnMI0B2ouYdt+WrTuhypVtloTGkm8ahj2ZheICzNZs82Vz/6p VZBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hLGoZcm6S0InvzH1X/WzyIJO8YBOcZHC3Gr39Gr9Bck=; b=DPgXtvV5UkTqpRFcc8PEEADbkPpPTmf798/kuvtGh1zaRHmPZ4EaX7mjnRbFmhVUm1 u1uJHziVy4aPNyDgJhvZcv7vlChgao4w30D9TIPLsoVncvWlkH1TV4AsvyyzxwAGnx7H rwnModL9NnJWiugwLOdectMj83ckZrGsh/V+QBvtRv6XUonKTVFJcRA5odc1e09G8yb/ akt5w1tw5b2Wg66RrRmvrDW9hHddNVXuwTG5neRV+4gmLuCrVNVub7Lag/5gBU/VmeWI FjGNjnYoiqTsdzkBXgNFOMWgSFw0/7A59SUK/iyW4IbkNZNJYDNU6TE+55Yuvk+1KYzG Denw== X-Gm-Message-State: AOAM531/PsbpbXLmzu6p2quBudt1DW5it3MLtfp76G7L2r5Zqk/LpZ4f FqbcXA7fFuo/Oha+yewwq8nVbyWAUTU= X-Received: by 2002:a63:a556:: with SMTP id r22mr7777194pgu.587.1638456821990; Thu, 02 Dec 2021 06:53:41 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id j8sm103463pfc.8.2021.12.02.06.53.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Dec 2021 06:53:41 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Dec 2021 22:53:26 +0800 Message-Id: <1638456806-26014-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638451242-24362-1-git-send-email-lance.lmwang@gmail.com> References: <1638451242-24362-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2] avcodec/videotoolbox: fix use of unknown builtin '__builtin_available' 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xO8yf0DxCvMO From: Limin Wang Old system is: OSX version: 10.11.6 Apple LLVM version 8.0.0 (clang-800.0.42.1) Target: x86_64-apple-darwin15.6.0 Signed-off-by: Limin Wang --- libavcodec/videotoolbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 284da97..519f55a 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -895,7 +895,7 @@ static int videotoolbox_start(AVCodecContext *avctx) break; } -#if defined(MAC_OS_X_VERSION_10_9) && !TARGET_OS_IPHONE && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9) +#if defined(MAC_OS_X_VERSION_10_9) && !TARGET_OS_IPHONE && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9) && AV_HAS_BUILTIN(__builtin_available) if (avctx->codec_id == AV_CODEC_ID_PRORES) { if (__builtin_available(macOS 10.9, *)) { VTRegisterProfessionalVideoWorkflowVideoDecoders(); @@ -903,7 +903,7 @@ static int videotoolbox_start(AVCodecContext *avctx) } #endif -#if defined(MAC_OS_VERSION_11_0) && !TARGET_OS_IPHONE && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_11_0) +#if defined(MAC_OS_VERSION_11_0) && !TARGET_OS_IPHONE && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_11_0) && AV_HAS_BUILTIN(__builtin_available) if (__builtin_available(macOS 11.0, *)) { VTRegisterSupplementalVideoDecoderIfAvailable(videotoolbox->cm_codec_type); }