From patchwork Thu Sep 30 13:40:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30778 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp700643iob; Thu, 30 Sep 2021 07:02:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyiSV6VRxMwH2G6ZggrIqy6D+NoA3oAmOeMUgERpEjM0TbI/+T9FrpxHh/lI7UGtt19fkHO X-Received: by 2002:a05:6512:3045:: with SMTP id b5mr6147788lfb.259.1633010537945; Thu, 30 Sep 2021 07:02:17 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z18si4558233edc.11.2021.09.30.07.02.17; Thu, 30 Sep 2021 07:02:17 -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=@outlook.com header.s=selector1 header.b=jL8tX6X8; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 48F7E68AF87; Thu, 30 Sep 2021 16:49:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2063.outbound.protection.outlook.com [40.92.89.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA02868AF78 for ; Thu, 30 Sep 2021 16:49:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h098u9nXQiwBN+7yjALzZkI1T2cg2Hh9F2ZpLlDFbgn5zPg7D/g7HoHKub7EMyNx9b7+Ktk8R88C1vi2HA5ncwWsRWOxKKNLt+fLq1nkVgvQFlkmkIWRvL09mVEEds1zphCCLSKujeGFr8AN8x5Z+A8TbyPizzlFYFFR6DJfMj4k6ByBmA2Aa5x5rHT/NBq1o1siva7AsjeJEKxwlzS8SYiKiJwVgCvVczqoq2ykPLinavPSiY6hJ9js28i+zuo/Px/dnMqSikA/32r3TB/lJ4VGzTwPiZwJahHwy8FPNrbxrx//OUZ8/cURMlxTyrapZM7aRT454EH80R1EcJCrag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=D4244uHHDj6HAO3BrGJM4jOh17vzfRhx5zNtLYt/ya8=; b=cKUGpU6petfSSjfgROFacynzMAdOhM+w4mc0Pkh05aFI5ic/0IWkoVfWoPXzeGY25TP059wFwYtdVm3hh3B29KbWlfhF1bjyxSXMoLU0ws3ZQ1r6TLL0JU67+rLgGYlyWauuO2AJ6QB+Lg7kRg8SatX2hQadFfSwbubeqqmv4svwfvld7A6C+rCspsjGwuZ03dDFqHZkitniiRmYvGN5MZJfRc/OGrTQ96EPB3nl6cEOuh7zkuy1GGhxobUZCrUJxvx1oWJZFAKy7DxDCzaj+KZqFX9NcGS+z9o8O8/rAWhoQzKijT1s++xFjTxfH6q3HN8ui4RuaImrOpC87plaLA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=D4244uHHDj6HAO3BrGJM4jOh17vzfRhx5zNtLYt/ya8=; b=jL8tX6X8VaoIt+1LX8UikQ8my+5/Scst/gJyweojufBYy/VWQDizdtFtMTIpdB/D6KTcoBkH+YXdsBDxLTXIj/mixpPKpegUDNqwqSJjuyEVpFU9/6Y1fiVcnsO9U5GtTV/4lcKOEDxxgUD6GobBgs6Oh9YwZDduQInWxoGgj00uOs+TZFFWj9UwsjuGBlB9+SaOBR8umkcwtr3So4tTFFdw1MORMj6xB8iEH1EuoTmVkcdQi4Kl2igsLu1EBZoTLlfDUKaLDhBfQpO1ySOrfiQz/EyqnKIvfzrkOc20wo0Ikx0Rc472BDDnjnb1ZjzdURtK8r9wFIoo+aZKwKM4Mw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5322.eurprd03.prod.outlook.com (2603:10a6:101:21::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:49:14 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4566.015; Thu, 30 Sep 2021 13:49:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:33 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Z0aMtRL2ofcKuMRhnc1bU88VQlGaNax/] X-ClientProxiedBy: AS9PR06CA0306.eurprd06.prod.outlook.com (2603:10a6:20b:45b::15) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210930134239.2672698-91-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AS9PR06CA0306.eurprd06.prod.outlook.com (2603:10a6:20b:45b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15 via Frontend Transport; Thu, 30 Sep 2021 13:49:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b8788146-489d-4ce7-5340-08d9841916a7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZvVltC3d/codD1BQlLrStDjJ0t8RtoD4SKdP3KfEl4PeRrAgRUHO0+PBh1OfGFnl0G0tFp/5yKHjGZmpOvH/teAP7xJ/ZVuQdcfO/ixX9tyqyK8G6KsKhaDgh50U0WWjK46UKgweuCzt8Tg/ZioeQWBTuOHGGa/t4bSGY1hVJeuk9lVspQceiz/mKHRX+dh8LyaTGSSH0TuwwECsmGwG4x/Pc7Oy3A7XAwwNX/OmFh6uhPHDtOguucykzmGv2PnmtnGe6ktGKwkwnjxVBZkeceZXs7MR1p3S8123cE7RpaXPIu4hDzl3QnE2seDFr6UYaxnV3Mw1Z5wrNhL73D4MTFI767NvGWj9lLnddfz7b3qAwhM8WPJA3Gw0AzF9z7Oz7iaCjxbXHJJrT5oaMcxeNrnbsumWaQtYUZh0LQK6Ip93vDbs6EyQ3rN/jfDBD0taZ4iRWqzjMV2oBEmKLkeed1hu4Y62O0TOXWEUZHXbBTe2TYNoVHAtbzsIyzkV/Inc+hEbg7o9P3M14Fogrj3UWotouvrZoidvcqK0rNLL13kIL0T6s/JfuaR5ufNcxlgvO5lHa5gchlq7qCHjhZBc+ajlujSZIM61WUL4ADfi9bgdxA2az6v5WHhXjdzI+DknwAlVzrCS99hJWuGYmMH1wmkEt3ThUyTqJXC3lGcIlhdb1ueD5cxBl3+gjtxif7iCM= X-MS-TrafficTypeDiagnostic: PR2PR03MB5322: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yP68YjF1vBhLMYpU4oWqTvP37d9bw4mggxFkVM6CJrM5N6ug86hFNrZRX/AreHilClyS468w8Bc9XS7f6SvTgfZF3c7LNzC1pnUwtLhKdzEteYsm20yE4EYEmRLwHGsAxh5X8jFW+AXhczQTO9DJjZcNKtxWMhyUHmQSEPesDY0sdM1XW631RPQzweLe5dtRA4EjBPHP8NQ5txwAeTkvDumZ80sWDodUMsFwAsfIAD9OB93yp6/tmjGIPw2wyAqesZ0OAWNzbFUjAuPQW4aehT9ZzAtXagzCpLdj02/423CYxPTBxbkTUAh6blCnlfsU+ow5tfb0mOqmrlZd7CZqOrFanzCMPwRn4ewR91Rj8UlPnS8WeHKnIMbMV4ijOOp+nmYxpJq6sQf62mmntTrQMs0b2vjEy/eyxRlVnWG8KHsxdetgJ9yrnNbGrRmg9Bg3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BE9hMZDTHt5dncuzKkcYEViTbnpunslT7QdxRPrEXkCDUqkvx566PDEEIACA4t8fNx5++8nJt75jVLHpvFgc3xMkN11Mbwu6QU7BjTqjT9asKBHrFwYwE3ka3GDZwazKM3AvXZ7SlKyACW9kUZa35w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b8788146-489d-4ce7-5340-08d9841916a7 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2021 13:49:14.1108 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR2PR03MB5322 Subject: [FFmpeg-devel] [PATCH 092/218] avfilter/vf_vif: Use formats list instead of query function 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8WEpjhXhkTYs Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_vif.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_vif.c b/libavfilter/vf_vif.c index 01851a01bc..20002c51b9 100644 --- a/libavfilter/vf_vif.c +++ b/libavfilter/vf_vif.c @@ -469,8 +469,6 @@ static AVFrame *do_vif(AVFilterContext *ctx, AVFrame *main, const AVFrame *ref) return main; } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16, @@ -483,9 +481,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int config_input_ref(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -642,6 +637,6 @@ const AVFilter ff_vf_vif = { .activate = activate, FILTER_INPUTS(vif_inputs), FILTER_OUTPUTS(vif_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, };