From patchwork Mon Nov 22 20:53:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ridley Combs X-Patchwork-Id: 31529 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7583549iob; Mon, 22 Nov 2021 12:54:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJwQE7I0hXwLnWWSG+V9b885qVD5IR2kALjBRQjzZQ2fTyPzgJ2zTRosWWP923j+j1aUegzK X-Received: by 2002:a05:6402:50c6:: with SMTP id h6mr68830193edb.228.1637614494529; Mon, 22 Nov 2021 12:54:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637614494; cv=none; d=google.com; s=arc-20160816; b=l2xzvXGu////IpI+4QtZpeeBjvmZ8Apg/ezcRVjcdSrL7NI6jJIWh8odOZDaXU5u6A 0fB0aGPGCvHud1VyMcGLQ9L6FVbrF4Wf4eF7D9V1GoIsUgQQthOwJHhGOxd3qSTxPZNU +AssVy5N5N+8Fw2/ZmPNkCfAbCFl2R4AF9yJRjKfI8oo8BMZXQC88LC3DCDWkqRGJ1wm 2WbYYX7ovcHH+qVomr2lSec727UMLdZik7ymd5Y2A+XWimzTHQdeTnNNzltLZbU5O9Xi 8UGUR7wm6wcpv2R80RQ7vb9rZSZPy/sgjruxAtWKvZeItPAZZKUHmN+dP9xVsSpEu/XZ baGw== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=dsEL+SK0n+DD7XGaqlhWP+AfjLTVjJ2xdgQOdrLv50k=; b=bDE9S+bKN7uv+oV643hcE6rQO4mP9yn524n84gasVWzGSJ3Z7p3o1eg17WhzPeIM/n 3LjhkdDFwgTb7x4s9zAwzvL1q+8oLvdVbo8Uz24wFLkO+8EbJ0+8T0hf0+8pSeE8wqql AoINTqTu46gv4MolZC3/mMuVYDGEdvlaxdE9ExKR4zi9ARvv9CxuSYUiWDqCgXKZhlpZ Tca1xS8RpjnZAD4i689/6Yx41NFwCoNCo1SO31BNM7lmd/E4VDwJ6b13RhxNaPnzpjhM vkxLR65ADXDyftjygdsbmfroX7yWfkHrboDnh/GaSgC3HrFnjElKvn5a1WleHUiAVLcj MaHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=CNCm4yl8; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ar8si20490276ejc.259.2021.11.22.12.54.54; Mon, 22 Nov 2021 12:54:54 -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=@rcombs.me header.s=google header.b=CNCm4yl8; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0FBEF68ABD1; Mon, 22 Nov 2021 22:53:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f171.google.com (mail-il1-f171.google.com [209.85.166.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7FA0268A778 for ; Mon, 22 Nov 2021 22:53:39 +0200 (EET) Received: by mail-il1-f171.google.com with SMTP id i6so100008ila.0 for ; Mon, 22 Nov 2021 12:53:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=WvQEEhkrtvyP/10de+H1WF6OnE/jl72H/QufzAqlh6A=; b=CNCm4yl8Tokaq6RZHe7EVuY4dNqXSFWIlMVdfxpJoW7Cc/FGmAWKQom+Fr4flYRu8A oRTUanv0EvFovPmXKae/hd7GnmWh/Utw3KZWLYUuvCqz4puEmFo75t4Mjwb5jRRPYpdc JGa3mYlU+n4k3D7HFqMYMTqEjOc+dODc5el0M/K0oo/UfdTiHDvdLNUkO+QsTCZYSD9a fJGDiElGCAaVhbFR+Ig/RWu6uto0XN70DqKksp9u2jPrDpXBQfR5wnVRpJSH9/MWL7Cx 9YI9oYLZ2v21g/NuXe3sBuv4h/XUuvWw8ML5Me5/O8jbY5oC7oB5dgV8hyuUg2bnb2Cs wZoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WvQEEhkrtvyP/10de+H1WF6OnE/jl72H/QufzAqlh6A=; b=yvKAmrMoOmKRvzvRjbB98iLApNOGZRxmrDyd25X0fPGPoNkbjQGVKZo/osViZmJrqH h6CwpPmlLPUkFJcFee7GA9hDQTP1vHCraNXaErLYlDVh4Dm/3CSx4m/2prW+fZjNcZdB ObMbRVQe2w1inU1tte0l2fsYQNl0sKB+JdlHpf7soVmE9NH6x6/zIjDnzIEpJebSLjMX WBJ5Gzopw5PYawbAKneut0NaKwQHf5I/NJKXGGSE3Ag7Zs61hx/dojq1vdHcOht3vDCe Alro9mHf5f4pigIT+/kkHAqpwW3OeCLrJcev3l7AwNxqDP6fqfEOI84SwVVpWQZRSHgU mdqw== X-Gm-Message-State: AOAM530MGyQu3pjCQZLx+SLvwKBI2XNUG+lenprzavvnV0+fY+M+gsUA FjsOlbhPdKckcyhWDzUHLKVEcQH6H+VWMxw= X-Received: by 2002:a05:6e02:690:: with SMTP id o16mr21784615ils.102.1637614417855; Mon, 22 Nov 2021 12:53:37 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:edf5:499:2479:42a8]) by smtp.gmail.com with ESMTPSA id b3sm3571580ile.26.2021.11.22.12.53.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Nov 2021 12:53:37 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Nov 2021 14:53:20 -0600 Message-Id: <20211122205330.43546-6-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211122205330.43546-1-rcombs@rcombs.me> References: <20211122205330.43546-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/16] lavc/videotoolbox: fix format computation 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: U6+m2VQMx4dB Use sw_pix_fmt instead of pix_fmt (consistent with other hwaccels) --- libavcodec/videotoolbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index bd6e769207..010f553e57 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -1059,7 +1059,7 @@ static int videotoolbox_uninit(AVCodecContext *avctx) } static enum AVPixelFormat videotoolbox_best_pixel_format(AVCodecContext *avctx) { - const AVPixFmtDescriptor *descriptor = av_pix_fmt_desc_get(avctx->pix_fmt); + const AVPixFmtDescriptor *descriptor = av_pix_fmt_desc_get(avctx->sw_pix_fmt); if (!descriptor) return AV_PIX_FMT_NV12; // same as av_videotoolbox_alloc_context()