From patchwork Sat Sep 11 23:40:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30164 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757440iov; Sat, 11 Sep 2021 16:43:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSza104aazvLcpkE+WxndI7AbMsx0THuv3kLMkukvTNyEkJAV4Mtk7Gcc4vxFALEwbwdku X-Received: by 2002:a05:6402:299:: with SMTP id l25mr5259339edv.343.1631403796903; Sat, 11 Sep 2021 16:43:16 -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 hg10si157333ejc.344.2021.09.11.16.43.15; Sat, 11 Sep 2021 16:43:16 -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=q9ZOmykN; 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 39F1A68A970; Sun, 12 Sep 2021 02:41:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2068.outbound.protection.outlook.com [40.92.91.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D4BF68A8DC for ; Sun, 12 Sep 2021 02:41:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fSAm2FszJLmRnqjKF/VS8qTgpGU+1V7l/P1ra6QaVSxtQ1WAib7ubYFVTfEAFadzLT+0Y7Dj6yo7j+4sOpI4njJ8EAotkP6A9X0Dx8RTjo/0CMTm3y/7pQ0hwNO8XacV0W9SJlUBkKU8ePbVoTajUrAAhMaTS/L5z5iX2AoLMRGlb34foE5bODjVL3VVcylTrRnI2pOeEOXOZb5OOov+EImIUIndMGR8+dmBmt2OX3TGSV6BJYY+Y1uzIqJykC7VVHHD7XUjeyuR7R+fblGqzuHmb1FrjZk3uoioemjtTIe54Sl4ZWWnVpRUzHURStfsDsjM5hRKsEXbFsdWMm7wag== 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=CJEE5y6uY+z4MqbnCO66uFzaijTvF0VlltVUF9PxglI=; b=PGghuYgtDuE/SPHlAEMkUm/2YYbgptVNV3lo/uhliNrD2JOpK+SRcCYhVeU9RmmkFp/O0JMBGzGSAcQ/vJz4w9KGTIJ5Y9El2mcd2OPIWXh3+ZVHQVB1E7KK3oExMaWuFMA/aWovRBe+eILpbjsaqVj53Y4Og1lHDAhjv4Npv6Hf6HVX9VLUUJhSWRhlJZOj8xqihbpXTKfmZED4/cBXD0iEAcX9E+Bj0YTYdFzOu45RRbN8Gp1/G4ewY25JlvKyBknLF5r9Bq6ATvZ8owKXe7NPsHs5A4yYnfZ+I7tQ75SJN+KGIlhNGdj8O/0KALwo5ZbdfBxB0Q/RQhAWKk5nRw== 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=CJEE5y6uY+z4MqbnCO66uFzaijTvF0VlltVUF9PxglI=; b=q9ZOmykNmv/kipTXtqXt9XNwYUEH7SH0IuJsHmiE0qubG5d6bH1Cq2md9aEm+TBPDfFIXGW0PS5kgwD69yln5bmH1N8+P2pwaJ9ewrTNQ8wXtBMDltLRcz6teS90jblw9Mey6c+RAA2O3Ep4Np7n1IBBTC6e7upUMKr7L3bgcm/nU+JR5xYWOGGYvjyjTsPCbr+OXQyxOMGtd8XJjXVnwarid2OFOOxXJGC7MEC0TKTtJvrRKp0u1Ws2EDRXoeeZzQxAVb4zQEBakL4rE/q1JesCVFINk2nIB+qDEqppSX5RaSazt9z2NPwv5wDVbi/zJy7q8qnXgPpu6U7sMSdqGA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5047.eurprd03.prod.outlook.com (2603:10a6:20b:89::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 23:41:33 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%4]) with mapi id 15.20.4500.018; Sat, 11 Sep 2021 23:41:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:41 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [rBkUW2sQ3J5UBrx23hSUDhX5aPQ70+s4] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Sat, 11 Sep 2021 23:41:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d1fff254-cede-47f5-c040-08d9757db005 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVv/2++Uk5pM+AmDHCluBYMP6UuXRiXYXfo+LfCjtPBlS59jRq+yMKbmf12fwFl7qMPsmboUNrm/ShbTw5o3O4eNeBrGlefyZZD2C4qChK0aeJQNkCtHRSwB4/8Qqn+KIbmD3qsBHZ+ouzb9aK6I/KqQkjHEH7cVRodwkNoUKalNFaguEazSOal7xZWlMCye0nHD++2Noa//dtPDG7Xekkj1Q0RgxBUWybSveJ0r6hOyRH8L84sZcM9JaVj1tfiLelxwgNZCrE8iwJlyf+BjdDlKnUDDnL/PpGrYL6HtIXbVjhb1wo9wtyPWN616XwdhGWy2bevcrg0aZZ1OaakEVhnKF1waPZWn8Dz+/Y/EUNzdI9TZofnAANOhT6kxTgHEFWFskOxjAcoQrKu+Vtu1e51jptzp6cLhNEKp656/vE0snq6ExAdFaj3vV93dCp6fjrhXQItbrOn3hXbvPunJNi7L4X0BeO3XG4i9oYvnf2i3NbRniYTmCrEk5lWDdznXy8zcFU5qkIaBAOOvA/rcPKgJMA7FYmbQ6YQMOs6hr9tjijvIJT1oNIkjwX1bEVpiLWDpdztRRnEGHfUKQ3OaNM4QHfO2guQarjn7pXWZwXmPu5Qd2KWxrDN0esdCaWrO/SRw99TqnmDpzKv9rj4Inbtsf75JImf21tHTsoUMqawKk1RnQVOizs45HcPr/s3lapFebbmXr21mqUoOrFqd4/x3OaHyNc8oj8= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F6c54KpY6hZkJ0/Kd6EfaAivHirgVosarjhywXmH5RoAh9NLGbQNaEDAgocNS1CoVeDU+Iqd8kvY8W/W0BgYs8VkxSqp7MGYwe47NOqpqoaYpBwOPp4yxdTkKdO+c5ng3tnXnJLuDoYuJyzDaXA2aOHEg7itGBIzJlboMKVVZw8wMZlC9h4DMAK9hVYjXjlDaM5lillB3QkTeqKcMnAlyOShv7lKneQ0aPQcq5vH7J3kZ2NGJ4EeYyUztZV5PfImu7EDRqPhuZ2JzlT0WgTmlJNly+QGmqx//Rln3wkHzyusoXjfetmJyYU2JhRDr4iDoGoATiIppeE9ijv6zEG4nxf4y2DSBSQO7rUwosJYlRdHFu4Sv6PwKRRhywc/a9Nlor2nRIePYwf9aFA0WJsG8qYpzf9OmYXGNE86GIMAMMLFUePneCkGof9/RSC8g5r+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QWkA4is8zP3jrJs+j+jxxWKCXdf4cMQspwQT3nsscYBIMDhb9LsdsqqPZ3fpsdodwn/WINR29O9RA59/YpZbdSb+L0xMIcEZjGqL2Y0OuDAP2O66O73PfyBrrSN956hXeqj8hKvMT+KS6Cjg4/3jtw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1fff254-cede-47f5-c040-08d9757db005 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2021 23:41:33.6275 (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: AM6PR03MB5047 Subject: [FFmpeg-devel] [PATCH 11/39] avfilter/f_graphmonitor: Deduplicate AVClasses 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: 1EWlxto3Mqkt Signed-off-by: Andreas Rheinhardt --- libavfilter/f_graphmonitor.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavfilter/f_graphmonitor.c b/libavfilter/f_graphmonitor.c index b712c2fdd6..de91a863c2 100644 --- a/libavfilter/f_graphmonitor.c +++ b/libavfilter/f_graphmonitor.c @@ -386,9 +386,9 @@ static int config_output(AVFilterLink *outlink) return 0; } -#if CONFIG_GRAPHMONITOR_FILTER +AVFILTER_DEFINE_CLASS_EXT(graphmonitor, "(a)graphmonitor", graphmonitor_options); -AVFILTER_DEFINE_CLASS(graphmonitor); +#if CONFIG_GRAPHMONITOR_FILTER static const AVFilterPad graphmonitor_inputs[] = { { @@ -420,9 +420,6 @@ const AVFilter ff_vf_graphmonitor = { #if CONFIG_AGRAPHMONITOR_FILTER -#define agraphmonitor_options graphmonitor_options -AVFILTER_DEFINE_CLASS(agraphmonitor); - static const AVFilterPad agraphmonitor_inputs[] = { { .name = "default", @@ -441,8 +438,8 @@ static const AVFilterPad agraphmonitor_outputs[] = { const AVFilter ff_avf_agraphmonitor = { .name = "agraphmonitor", .description = NULL_IF_CONFIG_SMALL("Show various filtergraph stats."), + .priv_class = &graphmonitor_class, .priv_size = sizeof(GraphMonitorContext), - .priv_class = &agraphmonitor_class, .query_formats = query_formats, .activate = activate, FILTER_INPUTS(agraphmonitor_inputs),