From patchwork Mon Jul 26 01:26:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Koshevoy X-Patchwork-Id: 29053 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3355312ios; Sun, 25 Jul 2021 18:33:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbIc65es4W6hpZKGUmJT/5iNr8179KZjocri0Vk7hjEolo4ewfZTykdXUhPOWmYHfUHM7z X-Received: by 2002:aa7:d04d:: with SMTP id n13mr18532014edo.31.1627263228872; Sun, 25 Jul 2021 18:33:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627263228; cv=none; d=google.com; s=arc-20160816; b=xtRP1l85AEKF8+kO/d4vjfKDeg1mDgM28qfWZBpCDr2Lxgc42DTYh1ilE/hVQzZ+3N 1sFp1ryNJ/isP7fvlHJYnb1S/9RbZMKUio+KTBBo6Xse/Gk+aSmZiYTK+Ntw/tyD3djY fi3E4uqje2feOlhvYI0CwlJ2Kch5m6ms2OS2LMtI753RdQkocM0vv3EIWNxZnqnKXqIw b2qtFIxP0yVMgGe4Pi0ROZaNWAxxezI3Q0t2Q8p+t/rUNm0/q0ofeI04wbjRIPX3DMH+ 3A6I7vX0+eL79TGULSR41n91A2a3UBMQ5sThRXAsviNeIoDT5Q6gNGMC2WmCwTP9dTDQ B20A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=vjwKTjhdgBiPx8FjCWFmDQWpBN0Rkhb2Fqt+v2X46ww=; b=tqocSwVkTITvdoXo1zO5vMQwlRGC34HdMuYJ+Z4gt+Q8IXHVJkl9vY0rXqlLzgufeK nWs30QQsJQJJq6uieIQ0N/nIe9dYnpe06WnbhFXOsDX/TjVVgKbg6duReAx1I3xXMRMZ 1sRsZB0CPkJpDEMTH6wCwHEW8rKnjTR8uQ4m9msNonIRlNgOwShVtJcVb7j/sj83KN+l zd7/rxEuka/o3UNsCRyn0Qhs2D6ma0zjI5CmePg9HYT1DvoXVy00kc1XlRmQAumQYMTR oLyylR5IOLDosDVF737c3p2ZC5fHviHplnXHlcn+31ubd38gSuLjDJyWQ7KP9avOHJe2 Jkgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=bByHt+im; 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 o2si3055746edr.582.2021.07.25.18.33.48; Sun, 25 Jul 2021 18:33:48 -0700 (PDT) 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=20161025 header.b=bByHt+im; 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 6111E68837C; Mon, 26 Jul 2021 04:33:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9BBD680688 for ; Mon, 26 Jul 2021 04:33:37 +0300 (EEST) Received: by mail-pj1-f47.google.com with SMTP id g23-20020a17090a5797b02901765d605e14so12003697pji.5 for ; Sun, 25 Jul 2021 18:33:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tbEnK7A6XTDoz9HuRf6RmVqXwkOd9jDFL/iioiFU0IQ=; b=bByHt+imhFi30axzvDAqqqyvHqeuRSs1DcK8n18HxxumhlSN5eTRwiBaiy/kJt3yQC ieWaU9HywLkPitSAMJTFf9KcHG35LfoI3EHAT9+2p36xFCQ1Tr+i4FnpneJYKLxZDfCx euYZftVTeSrac+Wr9Q8ayx9Y1M6Jnpn4/lk2iGODzWbO6dh9XuRDfOy8cdIlxpCGt+kO BPZB9YaqkAhkxR7wK6JsFnM94HSIh7A7BpF1BqGrDcjS4cBYxCx+oaDUVCY/lgwfdzro Ch2zzeH8deiPAirW3glRNjjd6uBpRz+x2hcxEXBHAVKYlBe3khNJhhn+yEQWmsArucPD dwrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tbEnK7A6XTDoz9HuRf6RmVqXwkOd9jDFL/iioiFU0IQ=; b=V8d7X0jcZf8QJus9x1BzbkWGqccxrjTUGA8uiPfaQYwnkkJeV442ygF+FTg1/dptCY A06PdgiWaIThKd4M8Dy/gJ8qkaNkVmqHfQocTnldN2jsbpe29MZUe6Ffj2jd7y0Zdj9w POJ3upsgTZ/327idwVMeeBX6dFU06ky0AGPAFx7e4KT5KBj/WOAGe68Gn1OHGAQ8GDSV 9wuvW6V9B56xwvYm2TCy6vJsiPFeOxOouIgkDCfrHB+q1+3tiF+t4YHFzTvMpyTptr5G H7VjBg4jZ0wMmnu6NZUObUx8yqCBDSdiPeK/QMgsFeP2tYXapdhJR/Z8Ivldfm6WhA/k /z3w== X-Gm-Message-State: AOAM533yT75tmrawU5Zj/tvHnrhcUmxs0hC1rDL6PLbD5c2Doik7QCe7 8Rb1iz7VcfwEQ9v5KEQirTZ0kcB6Yky1+A== X-Received: by 2002:a05:6a00:1582:b029:333:a366:fe47 with SMTP id u2-20020a056a001582b0290333a366fe47mr15671057pfk.0.1627262815548; Sun, 25 Jul 2021 18:26:55 -0700 (PDT) Received: from homestead.aragog.com ([2605:a601:a9ae:9100:b62e:99ff:fe37:7032]) by smtp.gmail.com with ESMTPSA id y2sm23565964pfe.146.2021.07.25.18.26.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jul 2021 18:26:55 -0700 (PDT) From: Pavel Koshevoy To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Jul 2021 19:26:54 -0600 Message-Id: <20210726012654.17807-1-pkoshevoy@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Fix build failure on macos 10.12 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: Pavel Koshevoy Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZhXRZ7++1NFu --- libavutil/hwcontext_videotoolbox.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c index 58095a1fc9..99e117aca3 100644 --- a/libavutil/hwcontext_videotoolbox.c +++ b/libavutil/hwcontext_videotoolbox.c @@ -420,10 +420,11 @@ static int vt_pixbuf_set_colorspace(AVHWFramesContext *hwfc, switch (src->color_trc) { case AVCOL_TRC_SMPTE2084: - if (__builtin_available(macOS 10.13, *)) + #if HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ colortrc = kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ; - else + #else colortrc = CFSTR("SMPTE_ST_2084_PQ"); + #endif break; case AVCOL_TRC_BT2020_10: case AVCOL_TRC_BT2020_12: @@ -445,10 +446,11 @@ static int vt_pixbuf_set_colorspace(AVHWFramesContext *hwfc, colortrc = CFSTR("SMPTE_ST_428_1"); break; case AVCOL_TRC_ARIB_STD_B67: - if (__builtin_available(macOS 10.13, *)) + #if HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG colortrc = kCVImageBufferTransferFunction_ITU_R_2100_HLG; - else + #else colortrc = CFSTR("ITU_R_2100_HLG"); + #endif break; case AVCOL_TRC_GAMMA22: gamma = 2.2;