From patchwork Thu Sep 30 13:40:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30776 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp703726iob; Thu, 30 Sep 2021 07:05:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDjg8JnxCfHAYEdrS1PO34mwcSIjjoBFdGyqvl89405auCGxmj1laJCv0Cm1NJmgWbFBee X-Received: by 2002:a05:6512:96f:: with SMTP id v15mr6179835lft.455.1633010711883; Thu, 30 Sep 2021 07:05:11 -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 q16si3516196edc.203.2021.09.30.07.05.11; Thu, 30 Sep 2021 07:05:11 -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=Ud3C6f6X; 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 6F7BE68AFBB; Thu, 30 Sep 2021 16:50:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2069.outbound.protection.outlook.com [40.92.90.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5F7E68AFE9 for ; Thu, 30 Sep 2021 16:50:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MIjaQZFAg7tgQC48hJ4fYGwzilkC6yjemlwMAp6odHfSPtRcHku7kc7yr4zQ8aGpgUmS5h/5rHlBnjyfR8GQfoBsT0zQNlivFxmgZguay0nkSUB/nCLXNJ6voYNO6x0PTi8glQVCdlMFkrgyEo4Nqz6kxjSGPXogWdf+FV0lOB+bj+4fEOBfInHRoXlP4+QGk8AVypsql9EQPSsxBN8oE7sQ5pESb9o6FdaD2sNp0LFjeBSc9MdIcEJ6cJqtNYJlOXK8GjOxJ/bLuBT/HyP8uafeiPbVul3tM5ZU/yDpmZ4WOwGnUd6QgY0cQ7J0mlsdAdqxrWAC+jvr6QnI9RE/Ew== 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=Dz1gwyEqjaasScjS5FuUncUHtIjB81NOHvC52vhx2UE=; b=JXXLK3xpKvRFgiZ5wX76Dq31+h6KsCVz1txQWSz8NFX1qTF02+KPBXK5U8thGKcMkWg7JYru8CRqKPTJj8fbcERSzx3IftsDHFBX4b/Y3/GU5faUu+3jXnZ6Glr7CvJF1P825fghnppTiOrElAmY2iDpUSDDDYTvJfkBsN4nC8nOXRKEh+RRwVUlu0VC74MDRXCyaBNfu5OkA31JlgTW+Xq44uKQ1gN2rvHyD0fTWTBYzgx8azXp68SGdOMFMDGanpoiXVxHiYsbsORrfnWJl7aK0a4/8ytvzYhf8nX/bx4THEiSJmt75ftr6O8+gijy+DspYMFSuh5MFUkKMvG/UA== 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=Dz1gwyEqjaasScjS5FuUncUHtIjB81NOHvC52vhx2UE=; b=Ud3C6f6XxDQjJRG/2NbIJRKTG6G80ccK4WTwNQ4C4EHuE0bNq/NG09cM1OAHwa4N1NhMLLXW/3FMKuE5+ggYkFbsks/6Yn2U1goaGnqGXyevMXm6Uf/pVr0d+27WJW5XF8N/G+UCf3U1LaU/IkWiHRq/0BrGujnbw6vBFS9rg9Nv8LCZT1jBONbywrEYiN7Wcyo46GbEYPUS6pAcazmXupg7kls+k3iqK8Tch9Nf7opKZ85Pqa3xSVGNhLNnnJECWu+7MMd4s74Fgh5+9qsM30aaXEydQHeCwX0z/uMac5QpcE8VaUuEM8NmxtjNxP9+Df1rRyaMc83Q1ORXyaJVkQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6831.eurprd03.prod.outlook.com (2603:10a6:102:e6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:50:22 +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:50:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:45 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [M2ALqEwNoDCQUkJqkDJ+ceLA6DoRN5WI] 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-103-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:50:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e61b7c44-43e6-43e4-a966-08d984193f4d X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Na3/Yp5vS4YWRHSxxISHqDD6xRo6y3mqxTYtjWVRZ+uCcIGW3fooMgkvDc7UlTaHD+Pp638ctbpwLodmUTDGFLrvWdCsEL5sCto7R72IcePmLkbGTpfRFzabRuFuaaSjHP2wqq5SQ5ViSbDb898e1cMiyjfPEVxbly+8Pr8kvgCwXMQjyW4iOi0pYlNqnAvqg+0n+3nrnpG7ZII7emuI+Adsy/DfZkclZNN+ogw1QTppHLChN7zntrzZTCOMAxosfNIWEZxNNBTofLVDNZCxrL0fRpHvxRR++c1pbjVh4D16tX73TVL8MSg778q7UGJr+TJNTOTmjt7pHiM073jQ0ivVQrcPPY7Hg+JOL/GwBeTCP3k+sopkh5O+JB1t0DNBGDYGPY/6ZDpgnD6LLakco2TsSaQHpnXLu9mmm8BwMq3XYxdwi+NIvv+9+BWIEYsNAnLyW35A0AyCZGXLrWyBgJuGAm1Da1vC12CoMc1kp2Vd410kquy38ljjQXu39jwO5IxE0oiNEHk0O9UA1pXYwZBn8+wUY6ZHJ/c3bxkG7Du5SZoQ6QOOfHjiABhkB7HhffjEXinuYLn0UMBd8ydqo2hhOhQEDcNcMrgAPvOtpQ4jcl8odtz2uOl8PVohlg8Lp1dfvpLVkPy4NPNllAYgNnV8eVdi++NYGW+PW132iEWO/EnJ0HBpMOCpOL4vFzJ+w8= X-MS-TrafficTypeDiagnostic: PA4PR03MB6831: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WUI7YAaG8qsVmDta1D7S53nAObDDBJ1n2piKV7/A+o3QWOKeiIkBnvrRikZSY6YCGn7TDzPgkU/4wOeALFKOvyXr+BTtc/S8qykVyNZiuZrVex6paIeFjppUXjbiA+lseX/xHmLY4z9KamN/DXSfMhsA0IPPU9TSUaZHxZqw7ehrvpnjwGThAx6Ro5OADnzIxukeaDxD0Sf0HgFnERkDWHOnL7P+QkKApLYr3OGoPRICqwK2hfJF9KvnErNL49UNEuqawzsNwFhMaYAUd16pJv0l9CWJkhZTIU5nsunu+F2L3MTSfu68S1dHC3Sm+RFL5YWTjyXzcT+leJypv8Il9BWuASwPKz3KdlUFduRUEjIhPpbGeU/pYA3nURopm8nyqqSiyRlFjpyjvDFV2mUmip3QtDfMCMvG8I/FYlUT8nmLfenXSzQwOEH3IqNfuR6K X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: p59OAbe5mA3FI148Hw8pz3SpnJHqwMzbeEFSSQSZwPFGSiEv5F8/DmGcAhWCRQ6goqUi8mMNtbuuOMJ1x5W3fmzfnWsx7AUQB0IFpap/j74QZrFQLC4YzYHfztGlM1p9wmx8VyDP4UR+tRbQjvI6lg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e61b7c44-43e6-43e4-a966-08d984193f4d 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:50:22.3138 (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: PA4PR03MB6831 Subject: [FFmpeg-devel] [PATCH 104/218] avfilter/vf_super2xsai: 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: jJ8ph61tfjIy Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_super2xsai.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_super2xsai.c b/libavfilter/vf_super2xsai.c index 11532925bb..3fcc035803 100644 --- a/libavfilter/vf_super2xsai.c +++ b/libavfilter/vf_super2xsai.c @@ -245,8 +245,6 @@ static int super2xsai(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) return 0; } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, @@ -255,9 +253,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(AVFilterLink *inlink) { Super2xSaIContext *s = inlink->dst->priv; @@ -361,6 +356,6 @@ const AVFilter ff_vf_super2xsai = { .priv_size = sizeof(Super2xSaIContext), FILTER_INPUTS(super2xsai_inputs), FILTER_OUTPUTS(super2xsai_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SLICE_THREADS, };