From patchwork Thu Sep 30 13:40:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30781 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp703510iob; Thu, 30 Sep 2021 07:05:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyGsW2y+SUufNBJnx/Mxh5wVWYlOn6WHc4dBHYEKkP8XSZQ8tciWEelAjQ3hsv4egJXWp5 X-Received: by 2002:a19:4344:: with SMTP id m4mr5803056lfj.155.1633010700774; Thu, 30 Sep 2021 07:05: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 e4si545389edq.91.2021.09.30.07.04.58; Thu, 30 Sep 2021 07:05:00 -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=DSQgnqSY; 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 5602C68AFF3; Thu, 30 Sep 2021 16:50:23 +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-vi1eur05olkn2010.outbound.protection.outlook.com [40.92.90.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B74568AF6D for ; Thu, 30 Sep 2021 16:50:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aB52mfa24RYLKwTM3Ey6c4LTZsDd9PR7krZ7CI7VcFOyUbzKiy2/nwQXUvvzkzn5fQJtWcqcajwiR8tcLVCPjknmBhGvpp5z3ETfpIjuEkYvlrzuqQ4PVByl+w6VrvgcCMNjQoHXE54stvRnR37FSe4jo4sgr0la1Rqp5kKXNYhh9ji9sWWGaSkEM/pw+Iw/ornZBusn2Q4NZ7Mfmc+kpeTH1dIszqP5QKckVOCM0SyxUV5pOytkxKhHrWFfjrmddZKA3h4AkhegAlVstDsjM0ezdbOoTochqPXJzRmiRaWUy83n4Eg9gGND+MXyKIMsbFKTYoVZ53c4bm7Z0UN8Pw== 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=0L9KE3vT6j/L01Zu8/b9qWIqCRxTUeGewwsKZDrTjPs=; b=kzaSUDumTVi5RpFWqqEfmzzhcJtm5Wi9S+h8SpARJhQhwlwn4ZHx6iFYAvHADcqZjedTtd2aIcB0Rfnvp2BhNSI/V6fQCQVFspWMBDnZOWgXbuRjnwEao5P8CDZfiReeiUIbIFugP/4QEjmPIP7/3PfrCGWVgRUZynRub87S/xy/8Ho4+DumYhpHvZRMiG8iA3UK4zVncPmriSKtH8MuoS6rzBlIMBcbzFwKrXkE3A+8pLxbWfuMHqdT6mUalaMROycYoKX4zTnRGxTGlZojzVWSSfzbm9NdBc5qDlL2LzRISXcFiwncpkcP3joJ7rPBvfi7df8FgNzFd7BTx0KJGQ== 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=0L9KE3vT6j/L01Zu8/b9qWIqCRxTUeGewwsKZDrTjPs=; b=DSQgnqSYJJzN7eX4+DkqEj2Vt7K/BnX5QegT9IDxw9knuXlqKNhfWoAXGiHY9dCGajmtew6tkhTyhAL4LcSwUu+98kDaN6RKCkkKty8ORNJ8aEJqhoUH4jjAiqDfXbJwMag4lIFYF25ezL5o70Pa3lQcBreRO1e36l0f+v0/zifVwMCKiHmKh4rIfU89panK4zz/0Jjsm4Zs70aIfi9kcKop3BfUDj3qizIS0G+lRp2VmdhypvzBKN38FPUHr8ZNrSffjs8QQZzSBPPHXGAS2c4fXXWZ1KTRgzoNCsusAxgBjPKT8aESbRXE8AfA+OPKEeYmD/Yzwels5cZcxaBrVg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5451.eurprd03.prod.outlook.com (2603:10a6:101:27::17) 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:50:19 +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:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:44 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [MAyMMYCvEQH8k+JdJlvW33607uFmYMAi] 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-102-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:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8ab1c498-311b-4b38-08ed-08d984193dac X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Na3/Yp5vS4YWR9BecF4lQIlpA9NhUhYw2FgtUYqKSnRJB9+xaSg31ZwVm63wF2u5w02yBf13XI+LPwxo5hT7Oh5qb0jB3tAOlAiMbyt3HeSm1a9B3Py2AcEaOXTzeX03KmAYd8W1KPgjM2z7b32uAoCv18Lq+6m3CyrXWLSjlbmREUpRZzpvFkV5Yxz3y7UdQ1oqGwanRLbh4J5F++ssL/E3B4Hp3P4QccpFGCqYYrHhgC4jnTcWb2j7m2/dIce4OD/+vLSaYxUp0qPYqyTUlOkiQqkvXPsIAdVHALmjSnVXRRCKzOv/GfuatwU0/+MxaQWqsBe0NT3EhxS9R4y7u5UgL13GHeA7Ev3uTsVMFfm7KGROXMNFCZXXc1Oy/kCIEZT+L5H1cynYdWti93ADyJWWox8ytJYEsoccyQGOCrhW3qRR5mLbqFmci9ehxShw/J28AFIyGRWAH5lB/TaNDhW8F2Qz9ix9OkhrubglJSc9Opi4vN5ssm0KcoYIgUn9K6RPS9mOFpbPEE1935n/s6cfwEk2AJ9OL5TfIndx2j6IY5mVUG2XX+uu4gmmURlMb8LTD13MFaQJStT0YdMp3/Vlj4O2ztRhzFlmb/VQh7v91KNg2Bo/T4j/G9pjtgGQMdjT2ROVEFfjhdV4PP/G66pzZm+/LP2JGG/UhYErnpJvLXNra/thTWKAJf3w7jKhTE= X-MS-TrafficTypeDiagnostic: PR2PR03MB5451: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rOM10JR7fIlQ0NjleOakWlQcIc9JjVtMBXHLD0X4T0x+3ALQbX31lzNwXn7eZkNuR3Iw8qF/LR8Pn2rY9RTrZKzbL/OKMFWq7uRUzb60LbRHVbcINJ/VLOwYyPvzI9jC/jEealYzp9edntfdp08lsjML0kbOiIlrAzw202rktcoc/3oJZmDoXzcjMZMVnosE4KYZplRDuQ5SlojaKtfGGd5pa8gCT7Wj7dH7MVh/KuOLOyJ1lhg1I+OZtEnocxDgBpY0OUcm8WE2rI+RiJiKsydQcB+qHNqw8SLvT/upGE8+qZ3YI4Mr8N49Li28xdzMh0buvHu2Fvsv/EQiG2zSEWXAOlsnl6YpzFQL7/vnR4iO71DLJPBdZY2Y8RnG69XEIttqtZUnQ8KMfBVtKF/hWT2zvO9yw9cHHLRAy2Sfnceb35vgUVm14opxUaNlwluM X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dtb27W7HBOiaLB6+yHTgu4iSx2kTSJHLfsgqYTgmvNF7woZHr5S/F6LspiGB4DoYH0bQHi5LFEgZDiKO/Zbs6VaFYKlGhSPE+vHo09FMrnSMuImDfp+p2lrTnRryrcF/k24N/lt3CtoU8yN8nFK0mQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ab1c498-311b-4b38-08ed-08d984193dac 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:19.5569 (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: PR2PR03MB5451 Subject: [FFmpeg-devel] [PATCH 103/218] avfilter/vf_threshold: 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: MHtHdRzhs2zq Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_threshold.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_threshold.c b/libavfilter/vf_threshold.c index 65da3734b0..1b8fde4439 100644 --- a/libavfilter/vf_threshold.c +++ b/libavfilter/vf_threshold.c @@ -43,8 +43,6 @@ static const AVOption threshold_options[] = { AVFILTER_DEFINE_CLASS(threshold); -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, @@ -67,9 +65,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - typedef struct ThreadData { AVFrame *in; AVFrame *threshold; @@ -355,7 +350,7 @@ const AVFilter ff_vf_threshold = { .activate = activate, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, };