From patchwork Thu Jun 17 02:31:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28431 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp200053iol; Wed, 16 Jun 2021 19:34:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzeQTL82/QRG1jtcOzUJ5FR66hohZvh5o8eWJTBIjvoGvdK7bkfcL6VLXHEEa7DK1wivWM3 X-Received: by 2002:a17:907:38c:: with SMTP id ss12mr2657384ejb.401.1623897254467; Wed, 16 Jun 2021 19:34:14 -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 jg15si4125103ejc.143.2021.06.16.19.34.14; Wed, 16 Jun 2021 19:34:14 -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=r+Zbt+sa; 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 BD13B680207; Thu, 17 Jun 2021 05:33:23 +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-oln040092074040.outbound.protection.outlook.com [40.92.74.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2490668924E for ; Thu, 17 Jun 2021 05:33:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m+Ta6+5hsyFdkg+shzFAy6zsZEGxmm8IvXXFsMP5u2AASlNrnkI/Rcwr4qVyTrd/grBGaaLiQ8j1BYfYJueTYox45dhIab3oaGPM/e69sie0p2oOpdDtWysHksMVbOuXZrwFrOFSh6ve1gsiTVeiGrhLmF+RqSRTK1+hQ2+P/tGpu3TeZ2HMahSulkQoa+SScx/xQdga3al0I6r7wpeYRU5JhJZNXgWn286xyXz1aFtuOtXC9oyOF4Wwvr1pgdydbRq8qNwUlh8byo/mI8hVgkaIo1wMj1Um6OCd9Z0Jhf274c59oLjFZm4foJTZ4QP8pCb+W7IbAXZlj9thUhMyAw== 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=WsjU67+Qpp+jmSNhQfwKPl7+zGhKY+NA1Xp6htqyQfM=; b=MngZRkF3lwgRbB2Zj++vgLyc8kydRBs9jCbHL/JZUpvXrMvYGMpT++a0lvXH6D6DixuHCJWoDWY1V3GsKuQTIuumEoG7IZPYmQZSE0lMqpoAsR1sU2wbzWmEv85OE77d+el6J8xmyI3oEbB9AL4npO+pfXX27DqVkVariRfiMMmvxQoKOzh8lpG8ZU+m7z4Kg/1ta3f4DtdOemhJzSZv8Uoiil0rnqPJ7AjdofrjX3XIfUYO/okTURq0BqH0LlhZCZOHqxuqqDQGx7h6qNDZTIx10c89UQuIs8xEulQVkYYpOqKUnCFYzyLs/oUbcZoopjCKfb7uytqEUkaOcwh+qQ== 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=WsjU67+Qpp+jmSNhQfwKPl7+zGhKY+NA1Xp6htqyQfM=; b=r+Zbt+sa2G2XzAOeFBCC82YzWi0AdnhSbd+uZ39INUgA7IhIVPpIUwfdIkpWSmVA6zyn9lVG4e86DnXXY0A85Q5W3nUi3s6br6yibuM1LDm3yIDFOYEYHOHbgaNgZHHiGfCqBoTMwqudoQ8ZmNBxdxkq7F0arFadql+Gi8NhOq3T6FThL76tmG5JovGC7p04MIZgt+uSKVkQvmGOcpsyMJOtTyUscFL1/ph/6GYVu4DEDnLNWwFFNiseelotFw4xNF5b0jiVdRuYvekVK/pZU8xMNvygVlOtYES0HXhT8M0+Kp0wZ2N5RNgei3ZSy4OAB0MT8Pykb8S7nmFRe9DChA== Received: from HE1EUR04FT016.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::47) by HE1EUR04HT116.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::356) 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:16 +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:16 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:AD1C5A8945CF8C408DE028F33CA22D52CF4E3820E437E1EAC929FBB755DF107A; UpperCasedChecksum:8EDFDF5880238290308268AA923CF7620576E8BAA396BE2578C8DB06F7EBBA73; SizeAsReceived:7596; 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:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 04:31:37 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [z2Eih2bGFjdWWIp5BX0QUGsbQ4Qcq4ZS] 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-15-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:15 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: dce45b68-4dd5-40af-75bf-08d931384300 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNU/fTcAoeunGvvJC2vgMUdOa2cpHb4x1SdkQVBmXuOoOY1E5dYcJgdkbgZLU2YR3SOQUDd/EahhpizUy+e/SFfzrW0EGjQMEpE5IbwcYn4r3TrTtbmia3HTjcyFUKiTZfqb6JdoF+9szHlBDZQUSHkeZwyaxVIYT1k4chwJjM143AAQ+1MJslAL6kHMllSUPLtI2+FpsD3bpFFtNhu0C5miTZYKJyhpHLv/O6a6vmILAnbhkyR2rFJ9TuuU8fMTLJjJq6bLoDLVUtqAkBMT/KH2S+ZWz0N0AhgbZuvAwtL0zCy734Sz35kBqNI09Ld9OChspqC0h2FHE0xZKhOKzvEORyGMjk7adyt+GBhWAHb8navwx+3XjK0pTyrY0NMzbJgtPLp/3KfbBG5ABRWDJalt0sZzQqWwPceqZbCK85waUNp8g6gTwicG2lN8+3X8u7llzMybRWicKc70GnoGxQPxOfTH1vO0bjUDEAGix48BdLbBxj2cS9O3dJfeLHGIqC2z7GvMfnQbdBC/xiYDjWX//lgXvxVbDcOgJlvlXTqNuMRBSntk4DgDgGRcvhD4dFP2oyxQHiYyu6ljjDm1vUe7kCpMzB9qmNVTZH/vZ7pU6Nqqcl5J6cC8J497aPqdCLdZKKxX8VC0TJ4K3vcUWfD4Vv7ULvHJD7PN9bz8ZUoAmiH2r7r3+2bTHiMn3xC4oJlOgVor5ZTIC/OQmEY0YZe+dN6lUjwaZPs= X-MS-TrafficTypeDiagnostic: HE1EUR04HT116: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Aq/Ud4aPybJ6qMgp5FzYv41eOl7gjdf+aZ1+3fSb1LYvON1MzuyGka45vUOj0u2DWngHgTfCTGApEb3wDYXkvN6amMJ7po7BwuifNyOT5hHoU32/BHjWnsb32KvdPxarbNBp03qNXBb5wu5lSeNkAfVwlXj9N1UQ1rJOqK4T4n45A3swBUl/DN9IqnYb07Gp0WA6OFnrHSL8MI/SfWv57oZKbzyQr9PAC8G9BMgs33uaMVOEGxIzTRxNjR2NsTgtYYUY10suF3bE92TcuAYZhOYlE1Wq/mXBwW/Sq5WBWniU/95D7LXrb6uZVImOf7r1aNR/WFBbdb5GIDYJOvFdoBF3Hi013br7lJOJyOXGlpTynz7IMNY08ry6akNyd/AbJQZiMpbz6JcAWiz1l5RGHA== X-MS-Exchange-AntiSpam-MessageData: SYrLx/ez2D6UbBiZa8aN0lytiTjqNy4W2FJVoEiFhPHJoA6WuLps8uIqm8QFhkLsuhtphNzAFm2SgvbAzoLk+6P/zvs0H8cHqCxVTs7uifMJ+ZMf4JJ8ApEMyUlcXvu0IkvYSkGa/CXW08arfnAMyA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dce45b68-4dd5-40af-75bf-08d931384300 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 02:33:16.4067 (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: HE1EUR04HT116 Subject: [FFmpeg-devel] [PATCH 16/41] avformat/pcmdec: 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: 8pKA9jFvhVbe 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/pcmdec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c index 01447c2b7e..63539a47c0 100644 --- a/libavformat/pcmdec.c +++ b/libavformat/pcmdec.c @@ -99,15 +99,15 @@ static const AVOption pcm_options[] = { { "channels", "", offsetof(PCMAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, { NULL }, }; +static const AVClass pcm_demuxer_class = { + .class_name = "pcm demuxer", + .item_name = av_default_item_name, + .option = pcm_options, + .version = LIBAVUTIL_VERSION_INT, +}; #define PCMDEF_0(name_, long_name_, ext, codec, ...) #define PCMDEF_1(name_, long_name_, ext, codec, ...) \ -static const AVClass name_ ## _demuxer_class = { \ - .class_name = #name_ " demuxer", \ - .item_name = av_default_item_name, \ - .option = pcm_options, \ - .version = LIBAVUTIL_VERSION_INT, \ -}; \ const AVInputFormat ff_pcm_ ## name_ ## _demuxer = { \ .name = #name_, \ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ @@ -118,7 +118,7 @@ const AVInputFormat ff_pcm_ ## name_ ## _demuxer = { \ .flags = AVFMT_GENERIC_INDEX, \ .extensions = ext, \ .raw_codec_id = codec, \ - .priv_class = &name_ ## _demuxer_class, \ + .priv_class = &pcm_demuxer_class, \ __VA_ARGS__ \ }; #define PCMDEF_2(name, long_name, ext, codec, enabled, ...) \