From patchwork Sat Sep 11 23: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: 30163 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757036iov; Sat, 11 Sep 2021 16:42:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzC/4yZPSYU09TCwreVFGUCg9rY7apXCl7QRxEmPZNRvNGKlG+tjxBYi9SD6MUUtjUrUtkS X-Received: by 2002:aa7:d8c5:: with SMTP id k5mr5259692eds.194.1631403746944; Sat, 11 Sep 2021 16:42:26 -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 dj27si2860750edb.317.2021.09.11.16.42.26; Sat, 11 Sep 2021 16:42:26 -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=fu0BgnDX; 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 62DE968A8A5; Sun, 12 Sep 2021 02:41:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068093.outbound.protection.outlook.com [40.92.68.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1CB0068A8B1 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=TjGGP5BYgEAY4zS/HhWOWdRv84Ds8i6JFRAWLqWUci32uK4xmQA96XB4MeJwPSU17BhOYU8LgnttdVRD+frUJN6n46oCQZMnpaWyvF9WPi3CMFxtjdXrzOuRhZYU+vfm2RqEkB7k5az590P3ldB29Mo+MSmexkhJcDlEjJsIdxpJV1VNWDp5okHyEhrRwKotlUfgRJwnQ/xLVqfqd4AYUOC16nUqv2Gy0RKctezG7WSKu72rmRUaYeoGRVi/16vw0KGzcYeFBoLGud7IHbJBq1/DxrxzzduFAyeOmv7TbdLxDh8MATxOc2QWR++8US3tVOpXrY6jdM2H+w4qDFd15Q== 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=ibKKxDHBN5gLCG4gSWEZrUd8a/FsE2Bh2n6T6arCH3A=; b=WzWmHt10OrQFrXnH0JpHIghQwdolncZTv7vg7wGNOqmluuftwRPNohWV6y9BdZvrpLIS9TNCyo9KCZvWMT4s1UcGr16UQbqBzJKNqyfg885vOFXXvosp2B2tOfqqQaD4Q5nlqJM/9kyNGlpnjzQKAzLulvj10FQ/BSTPW88Hy+muHTQkXYZHgHRAyOBTDbz4hqcbKss4vSJxT50Z14gaIUbn2CEOC0Hymll4UBTN84KyDAhU7LP4X6OEMy+rjVw86O3yqeljAw1ILxr1bOiGDxjhWFoG88IlNkXps5QM+BPRo6uk4Kheuh8lwJiX25znh0vAnlQxTc8EXt445su+6A== 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=ibKKxDHBN5gLCG4gSWEZrUd8a/FsE2Bh2n6T6arCH3A=; b=fu0BgnDX9ZaPliGOmFvrYzzX9DK1zXlTTUVqpbxCTMB7+j0gqQ2KFnOzRw4q/KNrFlINVV8t/pw0nxjHxcQJioOQJfrrv3OczhXgVKvhc4ITAFM7cclycNvIwVx/CkqfsMpH2x60B9uh6f0lG44pfDIGjpIc9VwVXpeiM1jDeGogbZwuYemeMMSIP4eodEyunSGRlnlq0y6xpdEyMBmY3+FIPjjqZ5E37P3AT7qG9OYzk0ykkvWZZL9azXYQ9BTttTr6X1iHsXSBRarDPs591WJ1l2lJcqslAEYUF6IGVeS3KQK8nEAvgw/9h4wsrH0RFbo2kYVJstVmvAXSsGs4FQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3399.eurprd03.prod.outlook.com (2603:10a6:209:20::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Sat, 11 Sep 2021 23:41:35 +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:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:45 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [yf/rO/mkIDwSuhsImcpLFiQsx4coXAOn] 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-14-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:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ced296a0-f4e4-4d30-3110-08d9757db131 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UK2WvWpU8a7bwaWAHGhJ/PKjovSh7sBO2LtYySVivddyN1tEaiT576LdTQwBXKZX+qkGZ4G7PfQwgpbgkaPPaWGPEnFeDL6H1NWaUy55Extf3V2/1nd8PuPXC7zY6+4mgm8TB4z/Y05vJizUotczgW9ThPOLnCgazfPY6QSveNMN3fgP1GcNMav0zPfVNQLil5kIrJhtjW7Vk0M9XBvxsDFoWI8EZIjLkCYhZ7wtGlx1E8wjl9Y8hzhPq1mQu42zDzEiOLG3iSnLO4+o2eZoR35EinywknRUhk76XOQK9UTS6W8BUCtcAzEpFbl7yK8rHZMG6qtMUl7oVPNkkU6BLYtUUdYjgptmBHIsUXe6Cr6zHhg8ngF/7MJpDR6avHWIvUjZnw7UtqJOvNcyRJJTJ2As4XXDEOb49K2By8bjqufoIzCB865L2yuiI0wONEcfeV53ZQ5+f+DXYENT/HW3sCRQiaYD+2lJZ5a1chbQyAQBz0Cv0aWDqU4cufegZl20P5fhNH4dsrtRqImK3sY/Nc2yeUwY38PS3h2Ah44jn1nzlUr1f0nlHU5AAd2ci2LIbw4Ulc8e+Mgta5/O5DWF4nv16J5QYOiaCXoKzXHYiJB55pwFy3ZB+HFRXfB1LfoQWEbfmX2nLKOMJd8yLoG0e33iwl/28NiC7+WAKCWDq4YVBv12LYOEOcw54LjPN+BcspwdiX+kl/CyA== X-MS-TrafficTypeDiagnostic: AM6PR0302MB3399: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FujpdycFsDvkJpFwOQ/Nvg7V+pU9pNKXYQB2n5nmRtC3IruCk++m5xe+TOjC/Nuh4QzXSAGX2vKUOnO8I8y3h7sgxXexsRLPtL6vcmB/3LUTYR+zx+y7KvpjAku4L7BX9YMtDC+W/Te1RfioImJ0Xdp/DNmEoxu+HfX7Gl3ZfS1ILmOLvT00GsTsid9MXpvORBDmbRG0oJeWxC9IkcTNkG8JdXfO3fJUGGRrafhDXs2R0GmWIrUQ2x9B7l9nTOvhfuj/2xxzW+jWb9XOOS06bJBicMdzlmZXQzmfDKr1Qq9yMdbfixwM/5y0ObFQ8V04Xxh2WpVmITqobU1Xby+aks6rLe6BQlZS/KvEOQfU2j+IeTu1El5p67azOfERfoag52WOZfbCkCP8tXPo5nLhW5O66Duwh3EYBgkwuYeijkGg69sppmbbQiPAQYcLN1ri X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yQLBAXDps/AwNFqbTfcM8eUflvslkIgLbtpuYFUJqYhX/xU/65Nx+XXG6LSoG8WR9ewYuLBe5bD4h4GuYQ1fDvmseFcjJl1dmP1lb5yVL+l9+LyPDVuv0Vv4rME5iqp2TkAjP/rbLHkcH+CCBBdh/Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ced296a0-f4e4-4d30-3110-08d9757db131 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:35.5949 (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: AM6PR0302MB3399 Subject: [FFmpeg-devel] [PATCH 15/39] avfilter/f_streamselect: 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: UfoFcEumdzKG Signed-off-by: Andreas Rheinhardt --- libavfilter/f_streamselect.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavfilter/f_streamselect.c b/libavfilter/f_streamselect.c index c5427672e2..80a133fec3 100644 --- a/libavfilter/f_streamselect.c +++ b/libavfilter/f_streamselect.c @@ -48,7 +48,7 @@ static const AVOption streamselect_options[] = { { NULL } }; -AVFILTER_DEFINE_CLASS(streamselect); +AVFILTER_DEFINE_CLASS_EXT(streamselect, "(a)streamselect", streamselect_options); static int process_frame(FFFrameSync *fs) { @@ -327,18 +327,15 @@ const AVFilter ff_vf_streamselect = { .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_DYNAMIC_OUTPUTS, }; -#define astreamselect_options streamselect_options -AVFILTER_DEFINE_CLASS(astreamselect); - const AVFilter ff_af_astreamselect = { .name = "astreamselect", .description = NULL_IF_CONFIG_SMALL("Select audio streams"), + .priv_class = &streamselect_class, .init = init, .query_formats = query_formats, .process_command = process_command, .uninit = uninit, .activate = activate, .priv_size = sizeof(StreamSelectContext), - .priv_class = &astreamselect_class, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_DYNAMIC_OUTPUTS, };