From patchwork Thu Sep 30 13:39:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30749 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp693961iob; Thu, 30 Sep 2021 06:54:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMOfuifrl0azhhnDa1K/0RMkQG73RdfuBKBXFTeLQ5KU91E1e5WVTj+L+shB7KHjJ89eqS X-Received: by 2002:a17:906:118f:: with SMTP id n15mr1149266eja.239.1633010094747; Thu, 30 Sep 2021 06:54:54 -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 w6si3467779edj.147.2021.09.30.06.54.54; Thu, 30 Sep 2021 06:54:54 -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=E91HRhRq; 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 F0FD668AE4E; Thu, 30 Sep 2021 16:46:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064049.outbound.protection.outlook.com [40.92.64.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1EADE68ADE9 for ; Thu, 30 Sep 2021 16:46:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DgRUxhmSjT1gOHrI7jhHijVlgMn50T5Ma0mO/AixOwDOcZKEyXYg2QdYvmIT/BlOvGelZ4TvGPalaDtcAW33saswK8TPZ1g4B8tUAFT1nzk2HTx5WzZ4vgp9SkvB6DAUSsBfko0PQgFhEQqG4NftSaVIZemLELTuCAnlrOeLkysDy9VZJOdn7V1f/Az7QnwNgGEqh6Ra5gOzDCSnO1dHzGULDvJ6hrLvx5ZdiPOJtYEAOB+TOzxDLs09UKEtCi1mubBzhD0rGZJ4sjAJorBSVUebRAAgHzqMf+nB3qGgSVgRxKAjP6xVwJCQMf/Pwe8yZXrF0oirPlL74Jvzu9hRvg== 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=CdwRq8DXaCmToOqDtKMZ3IfqiqbSR8hu+W7g41sQA7k=; b=PDGbMIgbJmK5H+31wSItWSemNR95Ql9m5Tk816zpHub7vSWjw4HA/IN9ece7DFLgeoDLWDg2qC/xqVB8GdMhv6HjLoEehsG5QDYtIE9harRfZiVYSzp3RlFtXLzRahivrk7Gyrn3RP0gY5DBlz70ZOewAkiELSEsUo6+bN0iQvQslpwnTstW7J+7MbdbCwrPzhlO30pxegRup5wii5pG/LT1uQoZkvKNes5L6az0UIeNiWYh7biZUhU69q1JfZ6VBczQisrUjH+TysZdayTWkBEF+HHhSQZ4vBPyHb3tS4Q8e/vSTLFWz/Qrf/o9fCHIS51ZNYbNLZeNKOwooTe9ig== 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=CdwRq8DXaCmToOqDtKMZ3IfqiqbSR8hu+W7g41sQA7k=; b=E91HRhRqATKVQV2JtqLeMxr2jpBlcsvwb9DPJjcInvN6WisFs+c7wVho3a4gcijlGhFUX47jAXuy/k5yxQh9mfjDlFzlCOBrhJlgQj045b+K/817QCJ/7sPjbdVnWJ/IM7JUeMOr3KFl0fpsgcaiqWUPDtjTl3hPqNzbk1GMJvu03Dv6T9jDnH3wFP7/7c854mCReACOZbUT2C5BaFV3DgzHRerTqNrquKpUUc7VXfe+tR3bqOlzcuOjX5pJJv4gj94mILMvS++5585kVT8k4yNoQucGgwv61j7Cp9tTBZfssX6uUFFetrYwELpAuWM5qqSkouaZ5ELqWu3xFWxHmg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6704.eurprd03.prod.outlook.com (2603:10a6:102:e2::11) 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:46:38 +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:46:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:59 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [9Jg0ksPhqb5489QOCR8KzQCVrpzxfrFA] 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-57-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:46:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f347b0cf-aa1c-44b6-3cbf-08d98418ba32 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOzptFBBX5RO9Wpd8w8Tcez2FZmb/irV96ZR4CMY/KEzYPnrHj+08Biq3bGUZn9slp3kZ1/M5Ng6U17D1hBuBsZz/x4J6DSfZkGtnEiLgPWZP2jaT6D0VfC3mSsvrBFS8LdfiPjHVY5leKrg928T+URPTakSCP9re3l2ejvI7VTkwNhfrjKt3gUZgt4xGYLSowSEFBykRuu+GydBiXryi833he0iqXRctWruQRmG0M3Ak1tD5kCQbBkxkDKS1Vv8wfxBBb+KWRLrm49wS5A8AKOfhz5lRz/ZDR9YyEvtcxj9PZAdB0a9toiEvmnLawjwHpvbiiig7Tf+dZUNvsudIWuUmEHMf/h94rLX9OR8Ivr5JbnrOPtYGErNflxYBNuwINblX/JWVttoKra3BKGSXZR9poFDxt5CksT+BjumFh7uZYiQQ2GNgJ2nlrO7+6UFTuewUO5ozf6qM64ZNPwihXd1Y0Ai50Es9C+vJK1xAcHj/x0hQrHkpkRPPsXF8D0n/XLIbfDheudd+5DMObMUGm3QxyEj2Y9ech46yJHUkHIMWpsG7YBZckMHfbIypzDghFp62MMvc5eRMdF0lelv22WcUcnJq2M6lb4mmYBuktwueJ46dY/zBS7T2r6vzftph1zNBTlHsNiRp1b+yXN7PGWmm0kYJEeFC+KPA/DHYBelZJ+Uuka7sQV+WGhbh9pfXis6XhQa+gFJh/Av6O6w7VK63KgyJmLABI= X-MS-TrafficTypeDiagnostic: PA4PR03MB6704: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: evzJxlkuD+BFUzKEg64zR4a0WzqzC1xYE9QWTUOI319HrZcsaLKNvN6V/gnE0qRNAiIu0Wex428HvtGEMxd8NinLGMfNXWQ86rvifGzlqQ4FHk1PSKgS+bKJ1lnIj06SAgVQb/k+bxH8ymY3NlsspYrrgIMpV/LolsDnxQhvGuUEpOApauAIm8hr7bLejgf+xM/7VafLQIsfOeXZNpw8OJ0m13VNTWuyKx+QK6srVTfxDyMAUe2y5LaECK23Yb7WxQG9kmh/Jyj9LABG4hQj2l9JREl4nmCPCeCriEmE6W2pt+HlrWGYxr4TQ35JKszbmH71o/HbDne+X9y9cdKqIhZDqMgY5guxgXHOb3wvwyIItGxeGI53OzWNAFUhgNdEUUnJBabeZvE2w454EkshGfXuFVa34MxtlTBLuNwgKrNYSnFIkid3+7QDzYh08jz7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0FE+G6uaH8HXlfNRObPNjojJ6SL3/YqtT7goHq/ArQtFVTiM834axhg51NzwqtmOUBms99OEN3FMXMYPxuWS9BMK5DkcDXBSv6xXmaW1pEo598Yd3AVlKINWD7blb/CqJmNnuF327gxdfDs7sot7gg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f347b0cf-aa1c-44b6-3cbf-08d98418ba32 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:46:38.9662 (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: PA4PR03MB6704 Subject: [FFmpeg-devel] [PATCH 058/218] avfilter/vf_blackframe: 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: bYjE87vxhRWE Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_blackframe.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_blackframe.c b/libavfilter/vf_blackframe.c index 29bed4af68..05641c2fea 100644 --- a/libavfilter/vf_blackframe.c +++ b/libavfilter/vf_blackframe.c @@ -46,17 +46,12 @@ typedef struct BlackFrameContext { unsigned int last_keyframe; ///< frame number of the last received key-frame } BlackFrameContext; -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NV12, AV_PIX_FMT_NV21, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - #define SET_META(key, format, value) \ snprintf(buf, sizeof(buf), format, value); \ av_dict_set(metadata, key, buf, 0) @@ -134,5 +129,5 @@ const AVFilter ff_vf_blackframe = { .priv_class = &blackframe_class, FILTER_INPUTS(avfilter_vf_blackframe_inputs), FILTER_OUTPUTS(avfilter_vf_blackframe_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), };