From patchwork Thu Jun 17 02:31:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28441 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp201293iol; Wed, 16 Jun 2021 19:36:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNPQhVOZkx8+cNE9qonjy5LqWNurMNWXgxf+6aTsy29YHXLYbHU3RFRbz9Q268PVOztXL3 X-Received: by 2002:a05:6402:cb1:: with SMTP id cn17mr3454054edb.42.1623897362873; Wed, 16 Jun 2021 19:36:02 -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 ha20si4105668ejb.103.2021.06.16.19.36.02; Wed, 16 Jun 2021 19:36:02 -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="AOzWv/qL"; 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 577186899A7; Thu, 17 Jun 2021 05:33:34 +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-oln040092073052.outbound.protection.outlook.com [40.92.73.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC5F2689A1E for ; Thu, 17 Jun 2021 05:33:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YumIMTgvchTFD2uerHFKNVXjPe1OlX+y6ZZSviA9sivdtyLJmvMMBK2Tu6fZdwKxhwAyHTyEMTKcMMnqqva4xK95FfX7cF3nofHg2EqNMTjtolszfdBQqWkKJ3jrjjq7uah/BUTABZKaimxaSnCy43K7bJsSlxlPiYelqYMvCJA5XBWvlro+/2VRHNjMzTq5MPpOSWNTUIQLup0JAurSbgglt9rsudRt3LJB8OiagnWpdunOLes2PgJj3ru1830kCXYnM2336bWvpZOlOVn0SSTzmFl6wwl5fx39vYAFzGmX0zAL3b20gZKAfzOHjo4RuCOS9+3NtOGaEqBdHdlfwQ== 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=ws9Hte1gW+pScIJ0wf6SaXVuT/rZvwuMdN+yD84gnYs=; b=mcnqfJlHCS8G52xIbWU9T+hj20Zgq4OKHJKynU8REWjxzzvINzVgWG0GTRibfKWzjZE9DIa/fIIFdbrJ+M0Nqkyp1FMSccg1xAXbNUZ1uxWatP8fEfr5N8PmTXb1cB9Jdo2qX8Dd3FW7dAb4Oe/nokfXym2C7KKkDuqhcIgwyD74xQu+XpEW7Y328VEpR4g75y+no0GRudjdIWk7rV7SYMW6FrCI4DTVH5vAlX4rbsgPFajxHNJ5BSyfcm0gH6n0vI39L1jg0lV/Ez22p39+vcxiLbG3TJG8/PUqVl3PGCsxpGX1ROzjtAuL3nEPq5079nDBsYxoEUYbCGKyb9bkoQ== 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=ws9Hte1gW+pScIJ0wf6SaXVuT/rZvwuMdN+yD84gnYs=; b=AOzWv/qLhribPCCPODP07vOtwslCkYUlqV2d2r8Gu+PrCOhf3DtYH+fIyihyxR6lvp8MpauV/fNDke1tZ/VB2tzGfOIfFNKvUkr5LMzIiQH3d2bn85xAjHFym8hhcrr8KnKSx0GMr6fVUcCe3+MOnMUsCwi5JJUaJhFugXWHXZ8PN40LT6TH0+ebHt0dVqQ2eoIzlBmYaopKjITKGUInNKFm0rz62K3LY2Izq6iJBdjBnsqfmfFzCBq7mLDtD+q4UGM7U9pKHVe665t8sY1xO4EFteSEQg7wJBT/5uUUD1XhzuKsdPoWk/s6GoABoKZ+e1iICsFibE38r16ylb6a2g== Received: from HE1EUR04FT053.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::4a) by HE1EUR04HT004.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::107) 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:20 +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:20 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:604E13AA5E46809774CF84311672442343903C82B07853B60DA074BDB351340B; UpperCasedChecksum:B9702E3FF489E306C49C658A884FC69D4760C8B25610537A6342D8EA9486EF83; SizeAsReceived:7586; 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:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 04:31:43 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [59WnfWMExR25oicTssvAYPra+7DWk7oO] 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-21-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:19 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 9d47bace-44d6-46dc-7791-08d931384512 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNU/fTcAoeunGvvJC2vgMUdOvl1X5h0rQuGvRxCJ6aGg5WfUx4lOBb+P9BTC1/KHjvw869BelsmaVTd3yX7jGoINT9BOlNOtPippAkGu1FjxLqQssmyms/FzlgLYblgQn3dMI9kyQPx3I+dxUVx+fFJ55cOZ9wng9HEz5KV2pY8LJICwe9z38J60p+5peo3LRRDaFtLjc9HBZkRLhGwD+dZRoKlU/B/ouEf2eUfE74BBz2cef5ub/unLPOHcmoB2QOn38JKWtWZMPyfq6cd6tctL2JbH2Ayo2wwNNVpP7bM39sOdBoN26/kO/DtzbVhDNOM3P0b/yDJ7xv1QIhZH22UiGPP5S5iQaFHd4L2gs+2vawgMoqt60vwI81G89ZetYQw2695qsNg0N9YXcXXk5KyT/6NiLainu0LwX8ERzwUiZ1Z1k5mxkv42CPEZVZs4kPifr1Bc2X9YvVrW/cu9onJhOLY2jFa1VUlrlsCHGQuoY4puJkaeDyo5NGUhnXPtJd3mA0V+jPZw3lfGNrLXeZYtnAwPYSvGptdvF3L6KKNgUj2hSXfuXlNqTqqRM5lImHJ9Jp57rF8f8fcBv9bwxXIBhb5mIu60tXsXiynGBRTJ+TbrGqvl0zl2XZvSPnE+tNhl6ZOoVwl/XQYXUbKGlErzAldMOKkQw2x0uj7bq5Cq9568+9TJibLNwPvfgKURFSZubvh1pXvfYExTjNlMPkKFktZ4Rwm17fc= X-MS-TrafficTypeDiagnostic: HE1EUR04HT004: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wHb/9Q/pzlA5T7w14PZKI9ioaGNACvEL/YOcekzlbnEmAKrlm8YhWMd5s8euyFp7Zt77VJjwdazr+ntxD3OcrYvZFV6JcYiR5xe1cLgFZPZae6au3kj9KCx/uB8I0KrRjMnmR7NyYNDkxcCtUksW/uN1vK3cYP1AOf6w7mqmWZaHZArPgCXLhzBx+fp1GypiUu4KRtS33AxAYdyjmivOraR3UTXQNSC9OZzxiAufgZ8RnzYtlFtmehnmHXJMNbxfZlsBj4wkeXqZFkHPED2XEMXUP3Tat91yk2QsmsW3h5bl39rEaAIaY9MoBgrbU4U4Of//rByZZV2Bsjuueitt8sHoSdzTfHeyF/W0g0+TGSxVvXKqnVAqx58MXiAMJPqvLWSXd3VEwmqCSvUxVswomA== X-MS-Exchange-AntiSpam-MessageData: fZ86zSiFqGvUM7z7ggLA8qMLGl4QiQel8Ja2i3+V69pRDuOIVhNtfkFdej4yuz3oK9Q3XfMe/+N8+dUhQN4iLiXOhWyA9G7F+V/qM2ySXtIucv7bA5wFyVVBbnNykQkl8Vw3xMZIIYc9KRVtQFxLVQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d47bace-44d6-46dc-7791-08d931384512 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 02:33:19.8452 (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: HE1EUR04HT004 Subject: [FFmpeg-devel] [PATCH 22/41] avcodec/ac3dec_float: 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: oBk4+jDkE+1C 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/ac3dec_float.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/libavcodec/ac3dec_float.c b/libavcodec/ac3dec_float.c index 3aa6482b1a..573fbe75b6 100644 --- a/libavcodec/ac3dec_float.c +++ b/libavcodec/ac3dec_float.c @@ -46,8 +46,8 @@ static const AVOption options[] = { { NULL}, }; -static const AVClass ac3_decoder_class = { - .class_name = "AC3 decoder", +static const AVClass ac3_eac3_decoder_class = { + .class_name = "(E-)AC3 decoder", .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, @@ -66,18 +66,11 @@ const AVCodec ff_ac3_decoder = { .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .priv_class = &ac3_decoder_class, + .priv_class = &ac3_eac3_decoder_class, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; #if CONFIG_EAC3_DECODER -static const AVClass eac3_decoder_class = { - .class_name = "E-AC3 decoder", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - const AVCodec ff_eac3_decoder = { .name = "eac3", .type = AVMEDIA_TYPE_AUDIO, @@ -91,7 +84,7 @@ const AVCodec ff_eac3_decoder = { .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52B (AC-3, E-AC-3)"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .priv_class = &eac3_decoder_class, + .priv_class = &ac3_eac3_decoder_class, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; #endif