From patchwork Thu Jun 17 02:31:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28446 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp200893iol; Wed, 16 Jun 2021 19:35:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3U8mDVXfZX+mslgqKigzu6QZ9s+2nwJTkTgEvBIcr6nRGT3bWDQbNMuPtc0P1TeqAb0y0 X-Received: by 2002:a17:906:1c4d:: with SMTP id l13mr2566269ejg.531.1623897327334; Wed, 16 Jun 2021 19:35:27 -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 i14si4037370ejy.705.2021.06.16.19.35.26; Wed, 16 Jun 2021 19:35:27 -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=hSIY2S5O; 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 2F8B4689AEE; Thu, 17 Jun 2021 05:33:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075038.outbound.protection.outlook.com [40.92.75.38]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D3DB689888 for ; Thu, 17 Jun 2021 05:33:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XUH730L5noEINOifSLrfuHbyESO4nxabLh5OLcTvbJK7wUDbshc0mjFpWBZox9UV2kK61Tcd4bIJ1X7dL1+fqB19BMxlsLPaj52i52WMa3cl2bH1r3w4zaJRdO5kCpP/neAjZPoHdX+OFZjj+/QSW0tvJb5CPjrd2H7R9mlyyNgMjm4sE2twcLL7GvRdWGZz7EX4Ql8Ncd+WgUDaWcY2gk2076xvyzKP0WxPB8EumNb+ThH6UjGFb3Zu0hhvJP8GvX4yAHDp2SEpQpMkeQVSGTJ+0SR2AtXob9QHW1DAP/qgcrAnZr2sLt1ArlBYeniHx/8b3WgW+ffyLkuVgMNcUQ== 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=7YGUvakmu5tWfj8/hEd/qqrniqGLB3tvPMx6DjKo2/Q=; b=TTR+lJ6yh5pg9tjGyJic/KvfJ6Oxn+PEp396oHNbXAf8eSkqvtUnAp7/8cEBlB+wJCzqw341JGZ+a9NtQ1aSCJ3mF2kyQtuLzEf25jSYIi8OyZlNjpFSUBvGmOP9gHaU2081f0EVhlCxCq38MyE/eVVVtosnhUv5B6Jlr+tRn42GrZwxMIWEE8M6UG+YU4kG0biWV23x9Sq8EU7mYHEFzsei/EsT+JFEeAysI8n/X4WStFrKOXYQFbfgqULJq0DQ3LFa9qMRIM3Km5Hcvq8A0KAOJI7NfAzmyFcEtnxoqudCoadN54QrZbMyAE6l6uCaCoax3O9xt+ORIwGnuPW9OA== 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=7YGUvakmu5tWfj8/hEd/qqrniqGLB3tvPMx6DjKo2/Q=; b=hSIY2S5OgWDbbgaioJHVkYoOOl7hcp+Upp3pFWxeSqI7ADUfHoRQidIUtJNPbmMZoazQKORtEJX+yU6jgSonsGH5F4DaSMHvVPXxEfpAuT1Qtsx+yAs2SBuDxMmm2qwcUDFrjETw/g2/Rqblv1s6Olg2g4OSA9I51ArWcEZ6bDDZPyE9zJ9ArUw2dOxlFSQVDBZTM6MtbC3oiy+z59WyXtKUWjAi8ydGYcfJGXTMicAe+JGM/6hPwrJjJbAgAInDaqYzi4WdwVH5LS6bo9HXgYGsPztiWrTMGHdr2W1VkjG8EPjuiR8Kh5wMPYZEXAtksSxZ0tkyRlgf93x75tLgoQ== Received: from HE1EUR04FT016.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::43) by HE1EUR04HT007.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::88) 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:18 +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:18 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:072446AC39C085525DFEE1840548A362D32C5BB26C34DAD4B8D6B1E8341B3A43; UpperCasedChecksum:6FFDD0E954791B6ED33A4EA2C01FC0CACA9144354E415B77BA4739F230A8A930; 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:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 04:31:41 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [1/PZwoHc5iSZsHpHXmreW/m2YdJTx025] 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-19-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:18 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: d9fb935d-e9d4-4625-08d5-08d931384467 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSz7Gd0YLSftKT0G4ETHQtWugpcKt7VXzKEobsEte6KqGVjPtKcqMTBdqoCR7xFA267m1dwKSkKwaFCVnDm4iKFWst0So3woQfJJBCHQcw7mIVC4cdrZ6sgA1CKyXIuE3A1AOytsX02UkIHbJCN75BkCzHgvqbfpbhF/y3U725rzDLWzyGelTs708m7rz5DOTrvRm0A6ek4nmeVKIEraTP+v0OZL7nbPX3+y0jVCyfk5sqAI6zGQoGRx5nYVn/ZXYsZUaealcz8Ob7NzFfDNnj2NrvZGjsZ/NaB28wc12JB9if5EaRJ3tOmN5/MbLbXG6OoxvbHGStyYlQzwYqn/cG9ZqVnczL438OSNU8RehjPrCZweCNmqOZsRm4p1Cx1HBvI1sckW+CLByiLyKyZtNCcqQIcqUjRHgZ+ZrVxYxXv3BYA8TtYSMPFlQ50wB2+gRLUJw/AV/BIbTGCmc4u8buIpX4Efees9UV5yyz3vkFzkavi9pTHNPFd6xKuUWwwLgKr+oskAcM2igWd37NRux/KEverbapM6/2au53cLamzFZ65/dHjePcizP3ro4YpK+6JDwXtScBDV1rcLX0zH04IwkZjytchCAUaUtG8l4iTJ3GjBu84fqVroASEsNx7HR/OWb7hKyOm7RunY69YcLqKU5gGb3hkz50F5cIHHu8xcw+wBRQprd4E2itb1sFvxeZD2rXYdvGk3ijyyjBC7UXonkH0YQq41ID9vL0HA3k+7lj+idzpyOypLaQXSIm2Dmw= X-MS-TrafficTypeDiagnostic: HE1EUR04HT007: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UkbOWlqHcAzbKFRitXfAU6J0i+CxZwYipBBX+jX+HYQFaeVUXI/ZaBX01V8u47VF2Yf+aYyBiHdi99shg16fYNYF5wmfsJFxgigYdIjGh0gunJRKDWb5wJweuFdqLTlvYSs6Aoe9uyE16iF2i5bSXoFiD63JZEBSsGUsP/1KfPuF2bWOe4CscSm41Fub5oadDoQJl+ANODdhsg43Ao9tBH/0cl2NnZSa8x3HbDxJHSP5oHizLWTtiiRUwLWLIxL+QOIyMhATYWPL8YqmtSGLzCvv8WOA6e4Gd+MCbr/EgmloMLl6V7KgJzbcS54J7BKBw0kbLnes0iHGln1k/uhzPm/k0lea1jdNuOEcjR7rbDPrblRsLnZZTcpKW/5vRX7K7jsYteTPRr2pzK1aoyZpbw== X-MS-Exchange-AntiSpam-MessageData: xIuoUt0/Jpej+CQ8Pi5UJEjbzAP1ayqK5EUV9dWnY/Ml7Gy0mJm6bFio/Si3VFbIl2dlM9pLbQ7YB1l47j+bFGoO0bXQdyhq9yNDY7Ci62BDZL5uLY+jjHyAE0QCRTp13WU11AA/5LNpWwEjGGlFgw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d9fb935d-e9d4-4625-08d5-08d931384467 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 02:33:18.7387 (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: HE1EUR04HT007 Subject: [FFmpeg-devel] [PATCH 20/41] avformat/v210: 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: 3hkE39DAjZ/o 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/v210.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libavformat/v210.c b/libavformat/v210.c index 361fd2a625..24f71d4014 100644 --- a/libavformat/v210.c +++ b/libavformat/v210.c @@ -87,14 +87,14 @@ static const AVOption v210_options[] = { { NULL }, }; -#if CONFIG_V210_DEMUXER static const AVClass v210_demuxer_class = { - .class_name = "v210 demuxer", + .class_name = "v210(x) demuxer", .item_name = av_default_item_name, .option = v210_options, .version = LIBAVUTIL_VERSION_INT, }; +#if CONFIG_V210_DEMUXER const AVInputFormat ff_v210_demuxer = { .name = "v210", .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), @@ -109,13 +109,6 @@ const AVInputFormat ff_v210_demuxer = { #endif // CONFIG_V210_DEMUXER #if CONFIG_V210X_DEMUXER -static const AVClass v210x_demuxer_class = { - .class_name = "v210x demuxer", - .item_name = av_default_item_name, - .option = v210_options, - .version = LIBAVUTIL_VERSION_INT, -}; - const AVInputFormat ff_v210x_demuxer = { .name = "v210x", .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), @@ -125,6 +118,6 @@ const AVInputFormat ff_v210x_demuxer = { .flags = AVFMT_GENERIC_INDEX, .extensions = "yuv10", .raw_codec_id = AV_CODEC_ID_V210X, - .priv_class = &v210x_demuxer_class, + .priv_class = &v210_demuxer_class, }; #endif // CONFIG_V210X_DEMUXER