From patchwork Sat Nov 13 21:09:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 31412 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp3678410iob; Sat, 13 Nov 2021 13:10:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJzDQuUbNcKhyZm4Tr2DYQZhpiBEGjEEpR4bo+6Mt7WtfDvvcdtgmilpuQnApL3RAWdCYIUX X-Received: by 2002:a50:99c6:: with SMTP id n6mr34488588edb.171.1636837837718; Sat, 13 Nov 2021 13:10:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636837837; cv=none; d=google.com; s=arc-20160816; b=DVVCAZU/pz1owDwsf3l3evSW2SOLR89bEhio1UFT6UEye1+TvPRVp+ieUA7al5AVjP Gr7NMCR2gtxQdPrkB6iCY7rWx1UfKjypc3L41iJ5rseqvKauhYbmVoWXqr7WxfFjvY5B iL3yppfQbvKVwcCJ3XAMzGlj+F5/LbEVDO+OQVJzIhU0OYtomQKAOC9QPPmnASInAvRv zF9cXeZMoymTR5VcZdWTy+P5BN0rZEngRbSstS2xXolC0u5Fskp3w/ujm4cnqAVmx8P7 wl/JnqY/oG6yxfDsabEvulHc94eHPhCHYNduXG2UB0AoQyqa1eTZNg3ZL4/Zrg6gZnRQ 3uNA== 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=Pf8N4idUbnTP/7uBmmkzHgkuQhE2wymXFQ7d2W2yKC0=; b=DmJZpEqxwBWm5SaJkovycjOl0IaeWK+mHsOhswFh0bLzhXCmEUefqFi7kSee9b8RcF wHKyIeJXeZInaUDX7D6dkAoSjE+4mYBKjSbhFcjY8mOWjCzyOzglbHCDIGLfAVdOrIDk yrNHpkgPcxD6Ohk4J2U5FqZAy9Tk+E//TbEEAFOZ6FBYwHM6wQejzN55WmDa2wjtw4IF pgiMylR76pXiQpF8h6hC2eJcaIsHMzNuHyv1WglCSbw1m0ZEoQY2D8PK+8zw7sxhG2Rv fL9v0hfFn1facZc0ObzIHC3yZufT29ievtQ7IHZWi3myuHImOMEOHOBBV1q3NzM0W0ds ZFdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=fJ9HPV2e; 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 z22si28521224edd.633.2021.11.13.13.10.37; Sat, 13 Nov 2021 13:10:37 -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=fJ9HPV2e; 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 5048A68AE3C; Sat, 13 Nov 2021 23:09:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f179.google.com (mail-il1-f179.google.com [209.85.166.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72E5F68AD8B for ; Sat, 13 Nov 2021 23:09:27 +0200 (EET) Received: by mail-il1-f179.google.com with SMTP id m11so12451712ilh.5 for ; Sat, 13 Nov 2021 13:09:27 -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=BNhebRca16Ey44WU/XOdZzsrhO1i0wNlsroXvPgY14g=; b=fJ9HPV2e26/eZSZGzPz05nq8nEskmkyxn/lWdxVqi02E5A2yJaNyd+4+z0n2RSFL4L cmcUzaebybJB+7QeZvK2v7wVyESw77tRoXRVk4n9bP4DejgEAiDVPqtZkl3TGxe6LLDu KU1cDcIaQINeSF5dz7Y3qO1NCjjsbvLxy4JqzN41Jes0CfFD3J7dKpQX1H5mLPZ6bqqN zR+NUU9igdlARM1NHjrBSyw/jNYozBM7QF6WkK48kzqnyQEwitogH6HRqBc3yg5fclYu 8dNcP7hmSUP+iHd+7bqPopq1EctD8g1wzpPiT+V+G9ZU50nom7y0w3hELbUCd42AsqWk vGPA== 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=BNhebRca16Ey44WU/XOdZzsrhO1i0wNlsroXvPgY14g=; b=NQf5fUOqPVP0xkogUD+83cAdw2ivK2H/fkHr2UeVmh7VKU+fuY3aGN0bare4nkTMd3 EJZBbo+57W2vBDb3Gc8U/T32rZnWygrcZHqrQy8GMtbZA1XU/FB+0w2Nl6oTMFgOh1qI nrBFM0m+ahcTCvh1ah3MvgYnuHujkOGHilnmGdT4CaL5KjIxu2zCjRpZ/BpWovL52loD t876XQO8sPC27iMzUqSwphoBx7gmDws8txoVIfgzLdsWaU4WqOSF7u6+aLhtFeCicACq A9IofVnxs5GFleWCwjwnSQVyE8gcYj5SzDnG7CL8B7eqpByyhMH2PlPJyWgqxXL2Du1q Z/kA== X-Gm-Message-State: AOAM533JmJbFTErq4AIzzMIZzM4GHEeM5tJ2na+Wcl0NqiyeJVuDK3eq cPRUuUpvkAsx49jhMmG0MmYBUTlgqhv9WJI= X-Received: by 2002:a05:6e02:180e:: with SMTP id a14mr14975345ilv.313.1636837765844; Sat, 13 Nov 2021 13:09:25 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:516:f322:7db9:ae0a]) by smtp.gmail.com with ESMTPSA id j23sm5243896iog.53.2021.11.13.13.09.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Nov 2021 13:09:25 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Nov 2021 15:09:07 -0600 Message-Id: <20211113210916.49167-6-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211113210916.49167-1-rcombs@rcombs.me> References: <20211113210916.49167-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/15] 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: PBo6R5fKCn81 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 510b1852ba..a5b0777c41 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -1057,7 +1057,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()