From patchwork Thu Jun 17 02:31:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28426 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp199779iol; Wed, 16 Jun 2021 19:33:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzaWdJ24nRQRsyQVRumqsyVwL5vdA9/NZO9dF9RDqwaQJFzaEj+lwU4Rb4I5JBgdH4EUP9 X-Received: by 2002:a17:906:4e06:: with SMTP id z6mr2672395eju.34.1623897230783; Wed, 16 Jun 2021 19:33:50 -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 by13si4185869ejc.433.2021.06.16.19.33.50; Wed, 16 Jun 2021 19:33:50 -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=mIZtP78q; 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 E4178688388; Thu, 17 Jun 2021 05:33:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073041.outbound.protection.outlook.com [40.92.73.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74A5B680207 for ; Thu, 17 Jun 2021 05:33:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NVZw3N8xsH4jpQriOtbkRLrwkBR5il4Px85a61KcsnyMeuqJSTDabN9iY5+K6JWvAVTH/DU6fYvIey2gGBLxeHuJwPAFZIzArdaRs2UaFzgu2g8KwWft3VFN8qbgKN/NHV7t3DTAkfM6iRtyw5RqyaFxG+eT9jwFprZtATYia+qnoG5AtksmZvYTNFn389L3pUIDov2CRziau/fBV4XiVNZezXI76k/rOLaDDzbEDterLuKY1S+0xQYBSq4j49Dj0kwqlk9GGTleUhB9/onXnTYy4gNjyOI7zs3efCGRj4tquHVGKVFMhmzsSEv8kkLvZXaB0eRQxTNKIglLhXdDpQ== 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=E5i5Jt45NN6jbYJ+WN/O0Y1QV1I67p3PTRwnNguiV/I=; b=ZVkfjiyplPo166xnLw0Gb0kW9xDfmm6gx+KSYEONMJXr+nzdhBuE42CGSu/5tYy39bD2p/MkVkF1NJvsK2NtQekfpXhSW7UdPMjwIioQ2N3rgOYzm6sjye/jyFfekMQVng5l2csiZXAOR/VsM2SCyR7S4PodPxJWHY8NpiF3GKuj1pjoHL84zaDyo1wK2xwNg3BticTkPVx1Lfnfs7HzLT9niAu55UYaUkA/H3D2LDCu418XcDQnghOjCCRVvdz0uZgwkJGB21Q3wHiW10Fzy1yKzgny20V4gE1rU+27CpKk/UhfAxnb9FNTdboqtaQH0mgeLdHMAba4VuENo+v8Pw== 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=E5i5Jt45NN6jbYJ+WN/O0Y1QV1I67p3PTRwnNguiV/I=; b=mIZtP78qM+6biG4Vfx6bZf+2Y7psGTbMlkVtqbjT9W2E1Rb8tYJqCx7D843P/hW+iSOAXdOJkkPkU7pm04SfFJHAfkQWourfzBk2iNiEzaqzyDFxwUMmC2/PwhqnYv+x/9CeiCTa0yN3li1OYdeYCiHTtBJM9NflVbDxBKO2rfDHY0f7aEKw2vHhQTq0k8URGGGSsY2Q03tu2G3T8cWXh9gaqijEMILWENqb10KhiaaBPImc4X1ZPHm/36FCQy8WqI3OS4FApX8JVw/DQKpxCCU9VTRW9GbiHQ0VNc/a1YTuIcS4FO1ZDgWeeAo1U45uTRftwQSMrXc9iDK0loyfiA== Received: from HE1EUR04FT016.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::4f) by HE1EUR04HT059.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::327) 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:11 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0d::46) by HE1EUR04FT016.mail.protection.outlook.com (2a01:111:e400:7e0d::93) 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:11 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:4B07CE9852753B255983FF487A4E84FDBEAA7374019A3D1F4C67C939314BAEC7; UpperCasedChecksum:5570BFDB2C270E7A75EC5178A1C89AFCFF82588953DC21044287B89E35D99D56; SizeAsReceived:7569; Count:48 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:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 04:31:29 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [OE4/V7mLDP35wm+kFDYtJTCh2YbpQMFy] 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-7-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:10 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 476b307a-9ca9-492d-e1e3-08d931383fdf X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNU/fTcAoeunGvvJC2vgMUdOa2cpHb4x1SebfA1vpQG9bmXHMpALDVZEIoGHlIqntRqM2tGHgjGjN+Rtay+S2UtpYXrq/dpjf4mkOU8CJO9UOFwaWUtGzF6RlndJ9iiOSdUU4sEWprmy3ZrravQhdIjuhg2B8UJ2b3PmCP7fw2jfFMN05ZAbQgYqCeIE+CUpl2KmFg8hhcYNF4Ts+HAtL7+trETIAyEbVHbQtcEwS71kcMNfdiGF0HXXg1peS1JT/X4GIMsExbbjWq1mbh8DM4gfXiSiw+xXUUubmRNXlUZzGxKwc8wfuEl7He5jj/sZw7+733GBi0asvXzASNaEC+QZubmabHdsIs8ydRLTb2XywEAIHHKBphGLzy0w81ngz66Pgy12NXuBQdDHpttP/Cxdg29YJ6WDpNcrmnYRa6UL2juHCTCAqPKvJ9CEBTLf8vJi1F8kBB9sIZlUSxSkey2njXTbwsKRPcFObL8dKeSj7n+UO8magolfcm9vspl/hPvlykjkA56keXW2/BWx1kBIWqQ1AquUZNsj/bll3k8bC3jmYAsPu2HR0mYzoSqp/ZxviRSdGFSfwihBds/xgvalWDbt5ivDp5bYLMTpUmz/H/KyGhvgNTej8w5Wv/JJ2L3AEblTz/7BTYFs8nscXQxZfygJcXoRsiHmD2UTGR+fWWcmXcAy5eIO7oMhQ+g5DVxkAvuS6+oNbeEPa1OIVIWcjYXjbPK7C7Q= X-MS-TrafficTypeDiagnostic: HE1EUR04HT059: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WeZ8EspbltNMu0fY5W4FT3TDTfHmig835wvN2I8bMuRDvRXOrHsoXQEOI9TBDabdgmsHJMTKYX1RwJwOhs/XXauAUVC237hqOX2p8J3yD7gaGtyQaNUd3HdrX4RzZbSOX/ODm6Jtz3/2Ql0aTvoRKJM69vd2+WauDoDAN6o/bM/bQD+atjcR9B67WwgV14TXrTkYCAjdaUvYEIcJ0uPVhWCkZDEtyVFt1KsBYyOOiC2pyo+IGVe8SPpgqJzJxN2HEiLteJ72GUykJMU9gf9n1xSO3urnFL7OaXgon21kuWEkbHmd7rt8bBgG+F6l/b6nvhfXy6gMkvQU/b1jd3eLJ+wsAff69cNPgs/gQn+8kyHAU7ci63EShmrCzDcpXAAhLoYwG6kv53IMSiOVU6RZjQ== X-MS-Exchange-AntiSpam-MessageData: +5snhyMwqUZhsikk0zTfNJ/WFKD1+X00560KugdTeq1yKlIJUI8Qlp9xL2RU5IES/w26exaQZfYXdtJlY+2O+psGt4keMTLc03+j70JDXD7F4doEsfDrl4Y7L81AVHIU7l48jSUa2AVvo30/sM4zqQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 476b307a-9ca9-492d-e1e3-08d931383fdf X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 02:33:11.5789 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR04FT016.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: HE1EUR04HT059 Subject: [FFmpeg-devel] [PATCH 08/41] avformat/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: x+e0HRdc/TCr 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 --- libavformat/g726.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/libavformat/g726.c b/libavformat/g726.c index 01d92e1d6d..4b08d0a9f7 100644 --- a/libavformat/g726.c +++ b/libavformat/g726.c @@ -65,33 +65,26 @@ static const AVOption options[] = { { NULL }, }; -#if CONFIG_G726_DEMUXER -static const AVClass g726le_demuxer_class = { - .class_name = "G.726 big-endian demuxer", +static const AVClass g726_demuxer_class = { + .class_name = "G.726 demuxer", .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, }; +#if CONFIG_G726_DEMUXER const AVInputFormat ff_g726_demuxer = { .name = "g726", .long_name = NULL_IF_CONFIG_SMALL("raw big-endian G.726 (\"left aligned\")"), .read_header = g726_read_header, .read_packet = g726_read_packet, .priv_data_size = sizeof(G726Context), - .priv_class = &g726le_demuxer_class, + .priv_class = &g726_demuxer_class, .raw_codec_id = AV_CODEC_ID_ADPCM_G726, }; #endif #if CONFIG_G726LE_DEMUXER -static const AVClass g726_demuxer_class = { - .class_name = "G.726 little-endian demuxer", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - const AVInputFormat ff_g726le_demuxer = { .name = "g726le", .long_name = NULL_IF_CONFIG_SMALL("raw little-endian G.726 (\"right aligned\")"),