From patchwork Fri Nov 24 15:40:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Bohman X-Patchwork-Id: 44788 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp1476339pzb; Fri, 24 Nov 2023 07:41:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IEh3+6fp6i03XW7a2TenBNIQZVvetgLRZLHHA2p6pSj9Mc3VfgrK5AXcvXiOBMhfp/EG4Dj X-Received: by 2002:a50:d091:0:b0:544:a27c:f7b6 with SMTP id v17-20020a50d091000000b00544a27cf7b6mr2721554edd.8.1700840488136; Fri, 24 Nov 2023 07:41:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700840488; cv=none; d=google.com; s=arc-20160816; b=VHLmhR5qbc6mjxft2h7AHemrGzhDq5KkxG+vuITF0DIEBP9Nfn5/ZfXGibOHVtK6WL BANExEfY7/AkhhUpuw2tK7mgFOETxZwfwaMHwII0DQ+JJiIk+87PYhnpClAihJwbP0KZ kKYAs8IsoCUkIp04QLrzGXcAGy3MPIVYtHSZcNxjs1F/4LuWNE5qsLLjt/wpCd9WMZAq t6Gef4MBcO8atIoGD6RV4dC2885bnzEE1+kgEGHAxt3BmRnLA5TJwYF/7P9SEC+4OpfN 69oRBOZipRF6OY1FjGb1j/Ib1jnRNDrEgg92DqTBYNBnQFURu+K9hH1oSKVyrDwyzjmg QB8Q== 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:to:message-id:date:from:mime-version :dkim-signature:delivered-to; bh=jWJ3K0a6ZBmcIyIpoz/deH0j7wxM2Ew1aAquhkH45o8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=A4QWAVeRln1dw7gPStWVGWyT5M+BIpmX6NF6adWd9AZ/u+GmUqfJ6rcQ/lyXAKgbsY AwmGGpuSFQwfM1UekcwYs8PwLEATH/uOa1krqoiyBulIEh7Fv4c+lt4TzJspvKHKLVjI xF/H/p2KNstq9O++juPhOnjC6GOZMThsDcnkx6qagFOgSYg2/SUZ/TPb+kkkA1JaFnsw z+NVQnGql0sp2DJlQsZxzvWHWcJCRTg0Ss2j2ZRpT4mH4/cwm+U9CboCg+x1hHu0eGzh Q4JSdhDJ034FtnDdfyDQw7JTugZ3hIJlLtw7v3AGzBmLS31adxgdQQmXn/JNu4ht6cPC BDAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=jZdJx9I7; 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 a22-20020a50c316000000b0054aff614ac4si586892edb.649.2023.11.24.07.41.06; Fri, 24 Nov 2023 07:41:28 -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=20230601 header.b=jZdJx9I7; 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 818CB68CF41; Fri, 24 Nov 2023 17:41:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9616368CA18 for ; Fri, 24 Nov 2023 17:40:55 +0200 (EET) Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-54b0073d50fso822671a12.2 for ; Fri, 24 Nov 2023 07:40:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700840454; x=1701445254; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=UPV2HjpWZnFoXynQu0X7X5TDnzVoMjGG9JIFvEqYSw4=; b=jZdJx9I70b/7PCgawHfIwNkInoxDNggob4PYgZP4Wc63brZ3X6FBwsbOvjC2vwctc6 KtdNvkXnrgFfOzF/NaCMZFWs/cSjWQU5znlGSSWMsjgEFw1pdvRM8H2XML6R1W3NSnZx ttFI8SIUIOzEvDG03hak3JSRnJmp2Qxjx8ZdkdJH39AYO970W6iEtIryHltCmzFtKSX8 DtopRaY6wxajcYYOm6CpnDqELtyV8egWi+DKz8BUZlz41AaB8RGOwEeG0eOik0ik+qGs NI6Srp/icrk9EbAFdnIf69caIA3+oUr6VKx2hWFFaYkA14qFb1o0OOZ6DBgQCOXolY0L 8sAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700840454; x=1701445254; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=UPV2HjpWZnFoXynQu0X7X5TDnzVoMjGG9JIFvEqYSw4=; b=OKsXpyjLXxaM5aRVzrLnYNbXBIX2Yq/bj8iMDEXyB5DEnNk/T22zFBvJOhFhYkI4u6 5G1aB037gdOswzSZHAnBNiKwrvu6MwCsf4WTVOrAVHkjVXduYkSzVuPneuL7hUg+2sEN ajzZNlWytTyWM1aub8LOIjUcYLS7N0lcxZdVixIbImJ3INNZtWNMVF1f9G9mmjBtYScX 2WbaRVjoqDYILpxQPo7ON8gxDKhF2AXZ0hdThzE5/7bWDxU73mD5yiav/59DnHdYJCHm DOtN2vDTLBx2jwTshtThieXxNGY8eFRBeG5j+9qtp4icaXrGap5aGg5xwzmNjx6E1Ytj Xvgg== X-Gm-Message-State: AOJu0Yz7iKK0jqQzkO43/zvEEvICds7QoTtGvbRnYS5UIw/Y6eErvtuU UZoeebivikdIOTZJTr+TGGPnSaVWFXigDTkWGu3bPHqRL/A= X-Received: by 2002:a17:906:74c2:b0:9e6:da40:50bf with SMTP id z2-20020a17090674c200b009e6da4050bfmr2480509ejl.8.1700840454561; Fri, 24 Nov 2023 07:40:54 -0800 (PST) MIME-Version: 1.0 From: David Bohman Date: Fri, 24 Nov 2023 07:40:43 -0800 Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] libavcodec/videotoolboxenc.c: Only log the EncoderID on macOS >= 10.13. 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: SKONHQZ6Eo6S This is to fix a build failure on macOS < 10.13. This is a build failure in release 6.1. The issue also exists at the top of the master branch, and the patch applies there. --- libavcodec/videotoolboxenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) for encoder. Use -b:v bitrate instead.\n"); diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index b0e827d14a..b72eb470fd 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -1172,7 +1172,6 @@ static int vtenc_create_encoder(AVCodecContext *avctx, return AVERROR_EXTERNAL; } } -#endif // Dump the init encoder { @@ -1201,6 +1200,7 @@ static int vtenc_create_encoder(AVCodecContext *avctx, if (encoderID != NULL) CFRelease(encoderID); } +#endif if (avctx->flags & AV_CODEC_FLAG_QSCALE && !vtenc_qscale_enabled()) { av_log(avctx, AV_LOG_ERROR, "Error: -q:v qscale not available