From patchwork Mon Jun 14 13:03:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thilo Borgmann X-Patchwork-Id: 28267 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp2823038iol; Mon, 14 Jun 2021 06:03:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyGqdlNaN6Fu/rxk0QXKdYj54eS5YIQy+NDd8+TLDz2rDDN+yip+cFguuPLCbh/D3RvOzW2 X-Received: by 2002:a17:906:2da1:: with SMTP id g1mr14922999eji.47.1623675824842; Mon, 14 Jun 2021 06:03:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623675824; cv=none; d=google.com; s=arc-20160816; b=ZB22yYd7Jk4GskaBHnxHSfFKkxowqeWr3hWstOTDIK/q/MbmzhaZHb5/3LiupwuwOr apFq9sIOWU1BIfHYTtVuZA8uUugEuHUvHrd8wGocxJFulaorCzwJAOVj8sWB7u54FuM7 S15fjyFQoeVSHWjVB3nXK5l9Um6KLlOdCoM3piQPbZ1APx9U3f5B+C2dx9H8uGAWcUH4 1/EQ6F9g2iwrUc+xr08Tfn9YIk9LFutYHGZYi5eBwTOYvXRrkmftY4wQeZu2vIHdtO1y wf8yZVAArQuxXFfxYX8xX7p/1bXGiTYrJjmIq3dZh6r/UVPOQ5u02xZTCcl82A7MIkIT 60qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:date:message-id:from:to :dkim-signature:delivered-to; bh=IINTyXSY9DtU2lTKWF6iZ6J7/pJ3wM9TinxGRf6CB3M=; b=JP1J267kkJwvfITa+Wz2HPqp8MVpZGNxCLK7Jy4GdTd6rMhdxIOh6OpnuZYD4Jrvmp 2f8e8OLlS0eTkpR7casT9k578UxOdagQRXALKwr6Z7NKpSHR3LXZhG4U6h/oJUZpWJQj KNufIpvhoW3Ur7oZmw8j/gXpLC4LO0MJ7JXPldzTAaoWuUVUnByTS6KzoFl3AoL9xfQg Et67zFZTCIZr9+p7NVbmH0MdM3nlNhRduibM9dwV+LudSJjssPDd8kwQw65dtHXGdTBF Viz2bgveySwW0/00NIvB4gHD+LCajjbLCFxylRfAzfGkiC5Kc3xIa1f9t0HlS2I3/1Ma qvxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mail.de header.s=mailde202009 header.b=3BdF6xFn; 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=mail.de Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u5si11177021ejn.571.2021.06.14.06.03.43; Mon, 14 Jun 2021 06:03:44 -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=@mail.de header.s=mailde202009 header.b=3BdF6xFn; 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=mail.de Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 14DA6688342; Mon, 14 Jun 2021 16:03:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from shout01.mail.de (shout01.mail.de [62.201.172.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B325680226 for ; Mon, 14 Jun 2021 16:03:33 +0300 (EEST) Received: from postfix01.mail.de (postfix03.bt.mail.de [10.0.121.127]) by shout01.mail.de (Postfix) with ESMTP id ABE1F10053C for ; Mon, 14 Jun 2021 15:03:32 +0200 (CEST) Received: from smtp04.mail.de (smtp04.bt.mail.de [10.0.121.214]) by postfix01.mail.de (Postfix) with ESMTP id 885BC801F5 for ; Mon, 14 Jun 2021 15:03:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.de; s=mailde202009; t=1623675812; bh=x6/m4PoOCt7L7iRJkfqQ8L0op2A4JXgLclaiVKjEfPQ=; h=To:From:Subject:Date:From; b=3BdF6xFnRDfT5m4q30v6PcbZRAxgPkZZZeKZrp3LwsPjC39Eoo9zIGsD+T8zCsvVN M/UdY9RCgKxv3Gtvv60mmta0ByzTjL6YKTpAAxTErQh5OBiQPAT16eP5fwwBDyG/Zp s6hHV8MuShjPgb1reLO7qwL2piLlQW2hzvZLMC+1+wr/2lg6VxDcFo3vYxBJdI2CQB pGgsffZ8zMIswz0gcIj9Plc75Cx+VQ0LvrpeKGJW/8bNsc3Esz89W8H7mptRD+sVpY uJ6SFi8BwFfn128aotvSp6q9i+rihou5zgkG3qdhXnZgm2is0NhY5DC8wMjuMd1mop TFm+Gl3en8JIQ== Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by smtp04.mail.de (Postfix) with ESMTPSA id 59FCEC0063 for ; Mon, 14 Jun 2021 15:03:32 +0200 (CEST) To: FFmpeg development discussions and patches From: Thilo Borgmann Message-ID: <000ad509-d87c-565b-312e-aaa85d587e47@mail.de> Date: Mon, 14 Jun 2021 15:03:32 +0200 MIME-Version: 1.0 Content-Language: de-DE X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 1944 X-purgate-ID: 154282::1623675812-00006678-84A58D48/0/0 Subject: [FFmpeg-devel] [PATCH] lavc/videotoolboxenc.c: Fix preprocessor macro for OSX, 10.10.5 and probably older versions 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: Wus9JwBiOs9c Hi, TARGET_OS_OSX exists since OSX 10.10.6. TARGET_OS_MAC is there on both sides of 10.10.6. Fixes compilation on Yosemite. -Thilo From a6c690c8f1d311995c6511fcd22982ff1f4c5949 Mon Sep 17 00:00:00 2001 From: Thilo Borgmann Date: Mon, 14 Jun 2021 14:51:13 +0200 Subject: [PATCH] lavc/videotoolboxenc.c: Fix preprocessor macro for OSX 10.10.5 and probably older versions --- libavcodec/videotoolboxenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index f063a86..888b6d6c 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -1038,7 +1038,7 @@ static int get_cv_ycbcr_matrix(AVCodecContext *avctx, CFStringRef *matrix) { // constant quality only on Macs with Apple Silicon static bool vtenc_qscale_enabled(void) { - return TARGET_OS_OSX && TARGET_CPU_ARM64; + return TARGET_OS_MAC && TARGET_CPU_ARM64; } static int vtenc_create_encoder(AVCodecContext *avctx,