From patchwork Sat Sep 11 23:40:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30161 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757519iov; Sat, 11 Sep 2021 16:43:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFwyNQ4+IWFFmo8Rw8ObSKa31ZCgG9wfFPelgVe4xcrLxxRjkm17wpeixCIdp7TkyQ+eF4 X-Received: by 2002:a17:906:3746:: with SMTP id e6mr1822648ejc.57.1631403804525; Sat, 11 Sep 2021 16:43:24 -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 kx11si2842279ejc.554.2021.09.11.16.43.24; Sat, 11 Sep 2021 16:43:24 -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=fRYDbeBp; 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 43BF468A985; Sun, 12 Sep 2021 02:41:53 +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-am6eur05olkn2099.outbound.protection.outlook.com [40.92.91.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5146A68A8CD 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=OHQCWt0h0hMvX+ZLVG+Go45NympJO32DqzVI0JL+d9k9VsdO2S0FG6uzrcZKd5auQGkvfQha5SMO4kOkVtdld4uzPBGiSzPBW24IFVx1I5WVZkArL0aYmrcyA1zRZx6/KpHtpe/3aJ2lJchjkpAmxHRtmsVifsFPEN2jJ1NylD1aZukhUGmADzvHuej+2A8KEmFensCqjbKecnB291UZQUqDZSCjrby9OaqJHQNIgeAN1fBInvFCDnN1OSwURGgzPpbDB3hpyQyCS0yEaYw4g1L+x+u7lW2+nU8s3a/wlx5t04g/niGh7gMsOQGAU/SgHwkNj4Km8ISyd6q0lbBbXA== 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=XY6ggB7IG+bLhyD8I0JJTxYnm8i3YGOt/4E5/ZyRv9o=; b=WKxmAdPXAoKx38QGFkvhHg8a53AaUXM+xCp86QIpUqBOBwm8yIBOX78h5oGyJqJCYA0eJpME/Xz0qw1UsyafQ0n6fmgRFd1y9YGy1FvgHfyiI6Y1CWMTtz87JlAQnUZ8J/MyWXHVb1ClE27xQVfshsegjNFDRBIcSFfo9GMaFBL/ralRBDA5dYhCUfHRpnFGk0NFgfGzCZCsaMnFLn6DIyWJeBJrDmkecFiA8ea+GFE/pOxprTRo+o3SAQpLT5hdQOkpSUrhrXT7x68CbouK8buJD99Foa8TDr1Up3avUqx6VLYJwrBREy8dBHI79KyyfQag9wo5kGyz2YYzFY0YKA== 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=XY6ggB7IG+bLhyD8I0JJTxYnm8i3YGOt/4E5/ZyRv9o=; b=fRYDbeBp6vfMEHTF8jwfspFpTn4iqmX8S9Tlzi9wq5Hib+24t4hDk1Y62MKk7MIzw8VasbkvZXE1FucUiVKBsgyRC5UNKZBRh7clTBttMH2uaJmvJxK5XJPFoTBiwfgLK1P0ITcHhfLU0+xu9Pl8j+btlU9vY0sZJByYpWzqSdjugdiMUsOHwJvPL3DyLcU48M5FBtTccZ/i+7uXZWqHJ2DOqb8XQauUleiavlwWeWGDGHq/2co7jIhoXWJNjSKwfG0HGw8W3Cdau/3zvdZHR2b1+z+WXROU5G3l3qhZAdpocSk3vwzX/+/22QF08AmHkHhtvVfu0ZfiZZadN1mdWA== 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:40 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [VDTG10LtrARM73zvrKBO+SSKekG+ZkUq] 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-9-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:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 515d395c-4a0b-4330-4f7b-08d9757dafc7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVv/2++Uk5pM+AmDHCluBYMnzScHS3Rh+wVU9GGwEWWIaLBjtu7NrrKpKcVylKBvd/ixyZu9WbOlIa0xCz394HvjQIswIsROtecR+bFOsZoshXYj0/df7YKjROInEY3OHsfwbohQ2LdRuEsYEqPp7VOrgDpyIXrfvkGUaW8JfjLs9TK++ow9mUxkdHNNKyiq8tkOu9IeT6xUxtVxUyYVDJKAju89VXqGvRBFa6Fltb0yetzOxYcSKtDG4YWJsPvwm6PSDuR0/fQ5PGYWLFAk2t7AyB8IhRObbItgR8t0awcP76JHGqvunuZhoCullHXr1DznRmTh6Xttp0O2og9q1UDXiXGsSnRGgUqeSjIrtrzV5dypnHVswqlOreLkm/Vg+B3BSxJ46k8ykxzshh2xqTIZ8UIMwGHaYVvQDJuybvJa/LycPEnL6TAghMwMMcAA0GeOL0As7c7zKpFnCDKR9snXjBkhnq2ynQDBqRu1y76DQyjgQB0Pi/yvGEj6HDf+i8Hq4fztvTn3mSc/l02UJtx76qG+/Z5QW9oIvwDby4MgIHTzwVUV7THfyoyQfnb8TvTxBnV//NEPpkntor5c4ZIIx4pW8oJ88sN7lk8y4tHjGa/J/V6ZSkVK04SmnBBL9YUQLzA7WzQouT29cBoK2i/eNdB2n5UR/6lMMCiFAnbnXWTHO710sgmATucP+BuqhMwqvQlizef77nqVh1tq8xRdy8bcIR+ReE= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3c6DU5gIs3nlCQWa32O2Lhxk8fkdpiulBwsUK0xNBNs4F7hOw+uvNserikq2aJhuGCaw0aR090D3HMgfK1IrsOIuENUH6Wvl4kTDtv6tnjYEcA2llwqG13JV7vM5QZUwKw5QnCJDDUC+iNEoyTeLiLmpWm05KXyVvzt2dpbd9wwikabQkziEfxVjNhCdUmpdV9tGV24ClD1VBfSJ96sNzcMP+nl21BJubuT6xXLXr5fVhMPOTRcnrBkU3vkQ8p74iACTijO7+uj49gVG0hxVLYESttJFaYGFk+2+MQt4aWOqLSLvGQfUpxfDWXvOjkP9hOOPhPw7jd+2hKAurHUqHt5ksfdbviykhGCpK+9KQSrPl9ACqEK/l7T5khyWi+KF8wdTfAOpLFf6cvicysrHHNemgHUgXesxLuZ7vtgGHyv7Kp9D41ixYVL3rmAdeX71 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dYCozB9KiPpgwHpaLP36Ru+dhcW6ZW/IjovxPsGVwJXRjfuEI17OhL6wdxs2/yVt1A1HakjiBudVlnKXUuZUd7+bV+6qBGDLqcyLpj3JuP3peVXIT3dTV+yhEkPbG5/vaQ2T3W8kMF67pgQqBlpQqA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 515d395c-4a0b-4330-4f7b-08d9757dafc7 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.2013 (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 10/39] avfilter/f_drawgraph: 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: jT/soGcfHIZc Signed-off-by: Andreas Rheinhardt --- libavfilter/f_drawgraph.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavfilter/f_drawgraph.c b/libavfilter/f_drawgraph.c index a9b47483ad..9996eb3b0e 100644 --- a/libavfilter/f_drawgraph.c +++ b/libavfilter/f_drawgraph.c @@ -84,6 +84,8 @@ static const AVOption drawgraph_options[] = { { NULL } }; +AVFILTER_DEFINE_CLASS_EXT(drawgraph, "(a)drawgraph", drawgraph_options); + static const char *const var_names[] = { "MAX", "MIN", "VAL", NULL }; enum { VAR_MAX, VAR_MIN, VAR_VAL, VAR_VARS_NB }; @@ -450,8 +452,6 @@ static av_cold void uninit(AVFilterContext *ctx) #if CONFIG_DRAWGRAPH_FILTER -AVFILTER_DEFINE_CLASS(drawgraph); - static const AVFilterPad drawgraph_inputs[] = { { .name = "default", @@ -485,9 +485,6 @@ const AVFilter ff_vf_drawgraph = { #if CONFIG_ADRAWGRAPH_FILTER -#define adrawgraph_options drawgraph_options -AVFILTER_DEFINE_CLASS(adrawgraph); - static const AVFilterPad adrawgraph_inputs[] = { { .name = "default", @@ -508,8 +505,8 @@ static const AVFilterPad adrawgraph_outputs[] = { const AVFilter ff_avf_adrawgraph = { .name = "adrawgraph", .description = NULL_IF_CONFIG_SMALL("Draw a graph using input audio metadata."), + .priv_class = &drawgraph_class, .priv_size = sizeof(DrawGraphContext), - .priv_class = &adrawgraph_class, .query_formats = query_formats, .init = init, .uninit = uninit,