From patchwork Sat May 15 21:59:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 27789 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp1582614iof; Sat, 15 May 2021 15:00:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZ8gqCQHEZGrf0NAcSD+7mB+wRDkE5CSTYQU2nx4lSV1BMk4jw9v8zGYGZYeuw8KXMCFgl X-Received: by 2002:a17:906:4789:: with SMTP id cw9mr20902211ejc.325.1621116008920; Sat, 15 May 2021 15:00:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621116008; cv=none; d=google.com; s=arc-20160816; b=jXWQ3fSHPDgw0W6AlfQdxW55tUY/l4kECSxp8rfoaxJa3AvWmnLrhCb50FRLrIUhOn yCzvGc65TBlqoI3H0KRO5CrHEgdsD0v3mtjYmFV7LYdiuZ4FlmM2sQ+wuVhtURFFxLv8 iShu9U30WqCu0pgJASTD0GpcfRA6jkyE/RABBHQI7/tHrzv6vKx/mmwaD0celZL/RqWF 0Vz49GCwqAxv1ZaP34OB/OxbENyF+QuaSsjcK4gIRvxZ+Y7IULslEMl53AUi8HrDwLna ZfiOpWznw87qEVQGSvL35aYgqnnx4w6pH5XuVpOKdISowOm7Os0nc2Yml6ZaD5mrtDeG /aHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=kpkvHrOzVJhc9RQOYU4lEK0Q0c8qL1zuKIfHYWzt0uE=; b=BupG+12/NB9WQ0ZkZXlKUtRWu/wQQeiFLB8IyiVWlc9bOok+MtUFYKQ40+vYAWv7m1 KqOSEkSRzHGJlA+tnb0QA14YE7OZL+FePbW8XkvQd3aYNaGrF/50yd7trB9zsI+MEcwx J15r7nKHkV8yd7jw1EOKcxbqAr5vaTGtlIUgOp1RLGBJgBOtKdrYzofA4+X8u7QssZCC YrJuAbxfsJblMHLcE/XdXEUdmEgQXulyhfwdG9t7VTgDhU6/WtvTRlHwlQNsVkFbBRMZ 9K2kfLtBy9bML4jtt4yQPmxDJWa9XzRo4x3SCk2Z0MNh0LCvG54VrzaD2SkVd1QxW9xz tlzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b="H5n/G6BW"; 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=NONE dis=NONE) header.from=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i12si9702780ejb.750.2021.05.15.15.00.08; Sat, 15 May 2021 15:00:08 -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=@zanevaniperen.com header.s=key1 header.b="H5n/G6BW"; 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=NONE dis=NONE) header.from=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D2D5F6809A6; Sun, 16 May 2021 01:00:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out1.migadu.com (out1.migadu.com [91.121.223.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E4756809A6 for ; Sun, 16 May 2021 00:59:59 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1621115998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=/BkSoqKps0t37g8BZCD6QnLrvHCE348ZHfucSIun3EY=; b=H5n/G6BW6+V/TDGWes8Jj8u5QUBdUM9/smMRDtQ+DcMYT2tWGZhQ0L3KXQifIs86J2Uj7j zOajmVqv9vjsR/ZyPPqtwcYSzgUY26oniBMDxz8HF/+X/ohn9UdJG+Tq5v090Um3jyaR/r 6CJbdq2jG67taYTFXtt2g2o9MV/a1ZyvK7Rp7sv+lkJwlXNQuG1M2BtQH+DDc4wv1G12FT tyyUfiV2hHPwY+iHlRbMoV+13S+mxj4+xtDGb9z1BSpLIMYeelV7sVVdEGegJtTtsuqur+ wbEO2He7kqT+ZqQmv0dtSLIBc18rCmJtClAxLCLwsm6s6ztscJDs3yV71+y2Ow== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 May 2021 07:59:53 +1000 Message-Id: <20210515215953.17487-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH v2] avcodec/videotoolboxenc: #define TARGET_CPU_ARM64 to 0 if not provided by the SDK 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1mCWN8zkuiIx Fixes build failure on older SDKs without it. Fixes #9242 Signed-off-by: Zane van Iperen --- libavcodec/videotoolboxenc.c | 4 ++++ 1 file changed, 4 insertions(+) NB: This is untested, I do not have a Mac to try it on. diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 58239e0ab9..f063a86e73 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -50,6 +50,10 @@ enum { kCVPixelFormatType_420YpCbCr10BiPlanarFullRange = 'xf20' }; enum { kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange = 'x420' }; #endif +#ifndef TARGET_CPU_ARM64 +# define TARGET_CPU_ARM64 0 +#endif + typedef OSStatus (*getParameterSetAtIndex)(CMFormatDescriptionRef videoDesc, size_t parameterSetIndex, const uint8_t **parameterSetPointerOut,