From patchwork Thu Jun 17 02:31:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28458 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp202884iol; Wed, 16 Jun 2021 19:38:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdfK3EYgOkWLoVg56HiHyC3Gi3lVb6dUtI0u1VSA9yqJU3gE7X5MBBitYxAYHMeFNSGzVo X-Received: by 2002:a17:906:411a:: with SMTP id j26mr2607263ejk.486.1623897520925; Wed, 16 Jun 2021 19:38:40 -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 cm23si816222edb.119.2021.06.16.19.38.40; Wed, 16 Jun 2021 19:38:40 -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=eFaVhAUD; 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 EA579689FD1; Thu, 17 Jun 2021 05:34:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074082.outbound.protection.outlook.com [40.92.74.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4862689BD5 for ; Thu, 17 Jun 2021 05:33:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MdTvRcGXFsIKv9kdwuJIcPs6Cq+vgVY9MPLJd63dOi5n/OM1BreGvmrW+bW9mSuKk0XFrq1mNkC0L7hxN+nyTBJhFRpRDKYFiZ702KfhnZz+V8hyBIJU6ATgwrfJNcoF2/VWMCmCkEFnftq2qg9Ypg1FFdzAhqYG0huYd+HEX3OodCrjbiCP6hqf1WiwcIdURceIVy+FvX8nl0hfNjzxIAfNdvby90KMedlES99tb7Z/zpttVqL1lu+IaeQ6EsAWF0P5CO/T7zWS2oYMCn7k6i82rueX01LWg5lxBleOescXXARQHwwg86Q313aIPrgbI2xoF1kPSYGQ6dncNfPYuw== 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:X-MS-Exchange-SenderADCheck; bh=mL+IsIx33Gdvufj7XSYm0amx9jWgXeK9b1bUw2ESLJk=; b=L43mcnGjlNzsLX6wAQAUTassqRAlsvBDwG97GisPbJO72jdlj+S2bAWb0CzRlPxAta/dp1Ne+bAgdkeP985eGhu04uLsazy3PCgoRa8RgnGepkZ6NzIXTFk9UznCd2F/BO0no2mQa6frFc08KMJG8aE6PgWuOGkpgN4ZLhT5eM/LmK3CrtYpyjYm2hld+dKg4doDvNwLd1OTPgUHIK/4ISEHaoXUPY6lrZSM/5915GxkAWpNWAUymdrYKB2aQnmk5vnnaxJlSd4CtYki5IEYf8b9SnGo68I13LYJMjUbWXXBfqTUivrTxKvVVEQktI/56S0mnh3U8nVJ8PT5hGKOIA== 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=mL+IsIx33Gdvufj7XSYm0amx9jWgXeK9b1bUw2ESLJk=; b=eFaVhAUDx6omMGZkSmk8Kts/atJOVglzmttEmahYGp3AbDn8VneLSLqVHFmmYV4lGPNOwZTvj8o9IHXj+/XfesWUWkmHn7yrquAoV0M0Rb5XYNELDVCMw8YtnX4oDo0PjY3LA1eJpNL9eBiigO2mxUf+alEw3pHbTI23P+iqMrv+2tp35Sv1Pu/YwzFaSJAXBQH/zrr4hp5ioIKUJu53avg2sk1vDolGISFaAzpuYq70/NHdPQIRAos+iEbnhvj1PUhzeLBobHPg7R8rRmqjnYHKGf44gE3cSig4ardFu616Kg0cmmPJG4NHA8TULwCsTCc0VZtJZSPEYmNBYEQgRA== Received: from HE1EUR04FT053.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::44) by HE1EUR04HT108.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::78) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16; Thu, 17 Jun 2021 02:33:57 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0d::4b) by HE1EUR04FT053.mail.protection.outlook.com (2a01:111:e400:7e0d::298) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Thu, 17 Jun 2021 02:33:57 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:3437E12E8BE15F13BB0FA568716D96C9CA2762B70885A4B22645017A16B99A23; UpperCasedChecksum:D96823C848276FF20AAA774B0B997A3B35F07BADEC5E4C77FC608756BB0BD8FD; SizeAsReceived:7754; Count:50 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4242.019; Thu, 17 Jun 2021 02:33:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 04:31:57 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [u1PZt06rYhBJe/0YG9XJ7+DVCShfK0kH] X-ClientProxiedBy: AM0PR04CA0115.eurprd04.prod.outlook.com (2603:10a6:208:55::20) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210617023202.1318312-35-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR04CA0115.eurprd04.prod.outlook.com (2603:10a6:208:55::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Thu, 17 Jun 2021 02:33:27 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 4cf77122-498a-4b44-14af-08d9313849f2 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/ULuBil78Tl/c0OuVoBVXnkC3quzdgnuRkT2j4rTnc1SI0KieVtAvNEQgZdA8pHeJBkBrw0bJCxLmLL52rCDWidMikT9fEz5tQm1MoEfq7BsikOMbYQTHwBjNzdfa8TTZYKZkMZ11U6gcORZHi+pOnYrpmWNEv88etkJjSQiPomzqXDr8tJOnvezU+XTWkgWrpT+zaTTa6e5MsEQSRO19b9PjA1Oscn6Da7MNHvmlUceyTx3BrfSUHwpBPmhmp7OGxFvEudF4Ha+gnOZDJncVg6Y7FR4mriETWi4NMl37WGB+8PLIHuDDckt8tu1tXiOPikM49yvgg8EE9PFYbQ5ZOyz8X9kOL1ELpHS4fM1h5UxTC6vMYl62MhFYsuzF1QVrbNLSHRsSImyhLwvdUoAT6uzNx2og+TUjepHirkh/BeT/BFj9BtfUqMPCVM+Uou6Qr0XUyeTrcpqdnC5ZsXl44USnq/9s7RWoDsfNobNlW93vIhuEpgtkWQYlVSoPbcW0qBFu+RTYelMGUQOCrnzQkp3bj9BKDwttTQg9wNM9nHd970HiYHktaD2CRGSOKkgj8AK/6o3WGDXr3AN5uPtGJsuwiMBBC1Tq84OYyvd4OSLnUUMVusfj2URsKXqwk+eglNnzlp7ULeI9e0oF8IJzfq515i+VnlaG8Lc43xKnMxarSS1N5gKfNfmCBL2xQATvTmJsUAmov6l3A== X-MS-TrafficTypeDiagnostic: HE1EUR04HT108: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8HLxVdIWinoMUMm68Zlapii1YoXEtqoGEnKJqLOec/eA5+Cwt6YVW6kLNQShhp4qGC6F+cDRJ+bDxLP91fLd8JolLtIHlYj8DutN13mlEYuw4pkos4ruUMABpZRRUnTt1JbruGatIr4/eTiY9v49Vw+V9EiD4D5pPr1d/oO9UgYIveA1EaqG4L4tKsY66bQn6mhYsyTXFgQQ8wZjGAhb/qsxbdeVFU7mM2zgVXvWFD5OnkUUU909Si9wP66j5LVUPeknv1HOHtvMXyds+Yu+y553A/JueOvAUCi3JO+6OL4Z3RUOoVuAdg9t8DZlxbudc/TFUWwjAuBWFv0AzfEOYfwhpQzsxErEwzbsLpR9j9xIJBWfiIWSZOmlHyg+d0vOc8dEys2pIFDWieSqR+YMGg== X-MS-Exchange-AntiSpam-MessageData: xoXafYF6KTLOh8NMFQDD0IQV+SevqOBLAGa7ZMfpYqoa7lVUJwuGQeOaFNx4PHZ8gI2oZZEW/IcLlzo+0G3Qh/pIK2unqbPzdR9qAVEzpDuyG+Wy4MhlC7cJAmjJ1ZrTZl10vrvIpd1LspbObl8wCA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4cf77122-498a-4b44-14af-08d9313849f2 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 02:33:28.0496 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR04FT053.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR04HT108 Subject: [FFmpeg-devel] [PATCH 36/41] avcodec/g726: 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: jTmvn+R9WZIk The child_class_next API relied on different (de)muxers to use different AVClasses; yet this API has been replaced by child_class_iterate. Signed-off-by: Andreas Rheinhardt --- libavcodec/g726.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/libavcodec/g726.c b/libavcodec/g726.c index 2e053bc5e3..2a0148c1d5 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -382,13 +382,6 @@ static const AVOption options[] = { { NULL }, }; -static const AVCodecDefault defaults[] = { - { "b", "0" }, - { NULL }, -}; -#endif - -#if CONFIG_ADPCM_G726_ENCODER static const AVClass g726_class = { .class_name = "g726", .item_name = av_default_item_name, @@ -396,6 +389,13 @@ static const AVClass g726_class = { .version = LIBAVUTIL_VERSION_INT, }; +static const AVCodecDefault defaults[] = { + { "b", "0" }, + { NULL }, +}; +#endif + +#if CONFIG_ADPCM_G726_ENCODER const AVCodec ff_adpcm_g726_encoder = { .name = "g726", .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), @@ -414,13 +414,6 @@ const AVCodec ff_adpcm_g726_encoder = { #endif #if CONFIG_ADPCM_G726LE_ENCODER -static const AVClass g726le_class = { - .class_name = "g726le", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - const AVCodec ff_adpcm_g726le_encoder = { .name = "g726le", .long_name = NULL_IF_CONFIG_SMALL("G.726 little endian ADPCM (\"right-justified\")"), @@ -432,7 +425,7 @@ const AVCodec ff_adpcm_g726le_encoder = { .encode2 = g726_encode_frame, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .priv_class = &g726le_class, + .priv_class = &g726_class, .defaults = defaults, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, };