From patchwork Thu Sep 30 13:40:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30785 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp700395iob; Thu, 30 Sep 2021 07:02:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyoQjswvVA0wN0jCf3dpN13rOxuc9HqdPwHXAsaL5xXdASOFNEuor2a65R/ptjzLb601wAl X-Received: by 2002:a17:906:38db:: with SMTP id r27mr6905983ejd.338.1633010520005; Thu, 30 Sep 2021 07:02:00 -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 x2si4440003ejy.385.2021.09.30.07.01.59; Thu, 30 Sep 2021 07:01:59 -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=aoTUNjoN; 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 2531968AF57; Thu, 30 Sep 2021 16:49:16 +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-db8eur05olkn2029.outbound.protection.outlook.com [40.92.89.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 19A2368AF57 for ; Thu, 30 Sep 2021 16:49:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dUPJfy5ccYHNLsIi8HIk3+msdFlnfSzTdeBoMpxEAaPtK4OjvaIay89EscwKTiiqM+T6Bg7J3lz5P0Cpv4PH8uajMoJxo6nPt1C7Ow7LsU013nWILwolMCW0ohhKpg6jsuLZNAGPAvpDtAatojfOV4M+21S5sYAJ5/StqK7EbtDVBTshXcrIqz7q9endHv6HeoBqPajv3aRLSmFyYLk5xwLdFaqIlthclLTd3YEJMY+9kAe9WkSkbVVqS95YDbNXwRGRAZJU0yuTC17jNRn6noPNHgPwgdgsutfpD3hq2LzxdR9FwJaduDnB0UbP4c+Yz1jSpQLgOl75ZlxVJvbQqg== 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=lFPpx/5Z43jFmGHsVWir0ILiPRU8Uz94qI3jrG5s8wE=; b=N1zKSQL8vZ4PzMO5WvNg7YA7d4wsadrtoypse5cuAWBnY0BYbhusEWzrKvWcilDfGJajtqr+iXdED2+QgSRaq3PZW3X6VcpmLp52NPrsRQutNwlRqIE+tuKm3KySfKlwlaubfPo6oIjQq0/s7Cche4CNgEIAd/f7adiP4ixtE4QZhyYZEgfdTpbeDZi8TTi/d14xgwUtcClI/IKBjs1g+nPPT+GA5rjfRu/Dc1QUk7QAD6dH2YEMR6LcTuExjCP5y5XsOpU/EjYaWu+sn0PIxIZEV1SfOdt96CRaqOKWhy6uw5+I8p7/X30/ThR0VNUMBW75LS+UjDv3Zl7oxyxPpw== 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=lFPpx/5Z43jFmGHsVWir0ILiPRU8Uz94qI3jrG5s8wE=; b=aoTUNjoNxNplwXJxiAMREv1xaeNcjnXPVZjG/wUUFfbBLlwSyQR6kiRekx2kIpeB1r0LtZi9C5v4fTwNd7+1PLOL+q8NSq2DgSyJiG3P+wL2qCH3OKM7jg3nOyMB6QkwComKK5p9GHdTiD7wCqoy9TEBvjckBhea8HTr3wlKm/ZX8Ub8yi2O/1UQZ4t6i1/vTyLJze8L4B9iS+nnPl9J1iocbxfRFjc1iGfQtBm+45lS8/kK0HbBLsKNgocL3gEw7OPaqMh5oqQNrvdp46HyVUxQrZiyY9kHnD2W4kwpTiWPcn/qS05YkxCbvGRpBL10n4tgNpe0cJl5fwLu78bGJQ== 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:11 +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:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:32 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [/WbEMbXLBUBGNEATqstgzgkOV49xyxE6] 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-90-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:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aea3d8e3-dee4-4750-24d9-08d984191519 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9NbGrtVb5P6HSVNdozOhkatI4/NFru6zLl3u8huzk8SGIoivJc3CGo9b5NsTtzYnIoQ799yOFH6DQu3MH2gW3QrLvW7Jl6RtB2izxcjeS8wcmi7t8WLhWy5qG/w65jcKfBRA9Xn3MHpQvtBslzAupBCcjUzS+ddxOb/NTJDtqo4wOetVdQA4liVbAAVWhwnhOT5H4p0jeuAT9Gq9TRdA5Vf+RIuoFiPrZ4Pt8U49aKgXsG4vTExsaWSv0/QLuNMRdXAmUfvnT3eUXcQPVfQFZTjOJTTt2I+at0DY9sRZOYNw2I79JB1vPimo4GL8e9JMtysoEzsTtwpiSpCBHcX5seO1C/jn8coDNW4ZDBO+6GsLQVPe++ODFDgX77EOEgBZo71So+h2S3fyf7Q3+0y6Hhf1z+Q+bsNarQdjXPUeWzVCJt9vd/wL/6ZqM0Jp+1Z3FjNHNGjHfhzXopBqPhNChOYYNGH7wiI5Ha7e39IBfQsM1HIvmMzy5Z8KbfO9Cj1WonaST5EKcF6T1wKoQDB8bIH+//tfmHi8Lqo3fOKTo4/o5WZF9u8MI14dBCynGx8WWiEI/aDHVCHvJ1H60EoFwARDZx6EdeO66msXPrbqeO9hLtEK9CgDuOTaC8qOYXyB8Gzgp4rms5qNGmGORCzKOs1DEPAgpKo1h2RXIR4UqsxUW2Q5mHX64vgpC0MdJHFa3OM= X-MS-TrafficTypeDiagnostic: PR2PR03MB5322: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A0i4fya6wzQnayPXudksS5naNc3RQeEXmYhBBS/Kws+r+ak5+c8+6IBSedNFYRiRhEHF9ooNLaVY1YnQcs/ap4yGdJSTw451vsdM7Hi4q2o6gj2h2Kpof2KkI2ThNKY0UuLRkws7MkaJPbfztBOSdiB/Ho/hKKHEYrLO5T4vctkQ+g4tVgM8x62O3n48Z8ONwnFTs/KbVh5auQ7eTDUFljM+P/3FlzA666kJUfIoNk0xv2yIqcpLA7cvwm7tjJjLmgm4gMlKeUp79S3+xx7L0i3cpp16SE8gG+OGl2nsDxmE3QvPTxrN1sUPmdVpyd5kbm1SBD9D8JKIM+zkt84eiB1DkEkS99JQG+oHuCCvMV6ke7F2MmV22AqMUOUJmnLZOTbLGielCc+rRXyj/UWpMkw8vzf6S9nKaCXd39AqG+ksjPkxkJx2H8efo+aLQ986 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bpg8BjDEiGv7xom4uQCV7gS4a+ejGQ8oKSesHcRA8yV+/bvSnYxkvC5lKQ01z2m7b1uun8GBjvc1zTVpbbcm0ISTE+oxbAisWT6wVfgwYvB86uhRyp9DI3soUSEH3lS7KOk7a/a/zcicauxejAqjJQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aea3d8e3-dee4-4750-24d9-08d984191519 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:11.5342 (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 091/218] avfilter/vf_vignette: 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: JKK7HvPzAubC Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_vignette.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavfilter/vf_vignette.c b/libavfilter/vf_vignette.c index 27772d469c..e7c336dfe2 100644 --- a/libavfilter/vf_vignette.c +++ b/libavfilter/vf_vignette.c @@ -125,8 +125,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_expr_free(s->y0_pexpr); } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV411P, @@ -135,8 +133,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} static double get_natural_factor(const VignetteContext *s, int x, int y) { @@ -344,7 +340,7 @@ const AVFilter ff_vf_vignette = { .uninit = uninit, FILTER_INPUTS(vignette_inputs), FILTER_OUTPUTS(vignette_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .priv_class = &vignette_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, };