From patchwork Thu Jun 17 02:31:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28454 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp201764iol; Wed, 16 Jun 2021 19:36:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYkT4EI4Q9X2y+Gzf/GdJi64Sp0+r+1QdVZ6MB+I5uwckpYqPMntRvWGy+J594YE4/GeVm X-Received: by 2002:a05:6402:946:: with SMTP id h6mr3362373edz.261.1623897404584; Wed, 16 Jun 2021 19:36:44 -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 l18si3818451edb.254.2021.06.16.19.36.44; Wed, 16 Jun 2021 19:36:44 -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=sTHzWGEQ; 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 06D12689DC8; Thu, 17 Jun 2021 05:33:37 +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-oln040092073068.outbound.protection.outlook.com [40.92.73.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B615F689ABD for ; Thu, 17 Jun 2021 05:33:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZlmfgVjK3JpetHM6z9OsJ5jmqunllGQbBafUCIl5ev61GVNdQG4QRwL/tJmtvMhhoJYGid7SGvVJrRDsSKwlXduMT1TEhfjVnff/lh5b2QHAsXDYWNj3xz207ZLoLMJcuuXCbJDf7i8a3DB9GfdO/bIm6i6/pZHfBjLOj3IG49KADLfgMGkKwGjYhFLtM9i2G6/fn0+Q7DePGI+in1J3T04H1SFc9NpyNEw+9MZhU/5VAzRcP3GLlVV4OLnsEFTb7LYpwh9DhLmhs/xgW/CKJhcSVew86v/I/tMnzOgAyWAeLqcZb89/gIFrR6cvcph0pYIHGT2Yfsf+cisCX/IyeQ== 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=yQKJVRVpVHcGzXlOFuq16Vb+q4uCeVX2+m2tA56GlKo=; b=QrTTeota+j27u7XBmHEJQIByt0TZmVKKYWHOtosWRTuK05Kc/Vao3lbdkGXssFwV4Pwc6z6mX4xsUfT095onzYBAUiraaxvzBjVZVXil853PZk7em9DbhcnnU22BBqUql7MRlb4mHVtdBiuUxUbmM0Gl9pTDqPDbuuYDt6oOFyccUOA4peIchuVHrKdkFmIXUT/RH/sCgLMjPq6v1CBVjr1QZ7g55+LNJCWFKU8nPL29PVmwnF2VO03Mmfll1ZGbnPH4mKC+rgfTjYsxylP7I4k+1r31jHa3H0hLCEoBeMDCQvuh9dBwFOwMywHoVXo8459wy4lU1iAvfF1Bha0FeA== 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=yQKJVRVpVHcGzXlOFuq16Vb+q4uCeVX2+m2tA56GlKo=; b=sTHzWGEQ4kNwOwQDMr6I3gAOAxwDe/dqV/3TZDjL8Nx9xMO4RFF8pjlMDu0k1YvQqV/5FUNQaLKd4qy4zzJn/JTIJI8s+4rqJKwNIJ1Xdd+H1Cwo0oQtWZ9Q6JsLKSWGn+rlJOjEn4cs1wxM6yCsozRvBOdTHJc5wOm21QnZIaJ0oOjGgiLGCB/Mjqh2rOqEBHc775SDkJ/NELHcKBoTJXyPWRYKVXOo5V8rv/iTpCf/1o+Q5D+5aj9yXVO57djbygb+8+PTTKWirZeygfKOZ9zt9R1IAXrnAO7zy6DzY/PAwIsj7kGqr/MSZV38102dubVDaKJcoi+16V98mmSJZQ== Received: from HE1EUR04FT053.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::4e) by HE1EUR04HT088.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::342) 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:22 +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:22 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:DFE5A98E970B05E64DBD1ADA29FD6ABEC6B53D3B4693235462584302F5A1C24F; UpperCasedChecksum:C62C3B24CF1B7EFF1A39D8261BC7499CE743AF2F5C9845B5892AFE9D966DE6BC; SizeAsReceived:7572; 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:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 04:31:47 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [FPi8R83FNovmDTwOyu+S7no5BeGJFC3P] 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-25-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:21 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 029693ea-f404-4013-3f9c-08d931384661 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/ULuBil78Tl/c0OuVoBVXnkCyEHH58u7PRtBd9cYO09x0aAzlozrUMYLX6832GQHYc/Hmer2ZuwGeROXv1T8ZAF4/g/UGTbzHy8441t4pF+j+1nphn5UrPh8Ww8jfCgyYy3T1W2nahgdu7g3exwExEYfu3UVsvv4ZIqd3mKgSIVqMzuHT8SEYagW6se+K/cq7g0s53o8od+deZjp35X2bv7wn2v+lD64DA5wOZrylOFUYpK5AmchdwE4DB2rXUqTxAVyELR6mZQGykLySdU6WZxYOFdDhdLgbLS0ms2gP03J3pc/ZUZqS9s+FphSCb24zmiVXF7UiiQKxM+knOmf66jChjXuhJdcBR4BHMKWcS8O4cTqL0rGc4DEDwRayozIWaDOWfXAJQ+kUfonw13GX0BiYWQ5rgV0BnL3L516J56MuJyhC3VfYFGLmFdnRQSXGCbAo5TkxDLNH9nqpFG7Do9VZusN3OCIQYp/+cC5ykW9lUavzz1qGf2VCEcG/1cg/x8rUv1ztheB2JLaIKQ8gCCmFN1T1PTNw3v2gCZ7TLEE7nnE55Jz5C2x7W2voXE9+Tv3yPHUf6aw+khDwQMFXPZKf1nb/iOM1lGqzST/noXfXfdQAXsaC/mmBT0vbn/MfNlxmwS/gOBosId8oJ7dz5rQK3R3Y9go9CG1mt5beaMKe2KvXCvm+ddrMnTIPejjKnm8JC7Tv0FwCw== X-MS-TrafficTypeDiagnostic: HE1EUR04HT088: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VbBcQRBuuVNoHo8DE3gDr0Gnv0WPYv+DAq1GKplR/q7+m4I/oih/lY1Yehd/TXo513KB9eLJCM4IJfpKguHGAZB/XZ0IJJKL+j5gSiXn1dQST4T16tZja4E3XVU2+fo/NXbNGp/HzBWwLZhHdx/nH326x9t6gPyIfCFcGYwwIbab+ZnoMsvdpJlEEq4FI6xIZt6bz5AXaMC5PU9/dt7lL8L/smJuoylVgXHP8vvU50y1zowKieF267hjGSnYHQg/CFSBTc9+gf/ln+uIs0pRh4CqniNkPtwbFcmzgOear2xq4w+7Iu2sGnGKQ6rOR2C8k4NAxnGQZwvRHbEykuYwEEBkrLC+BV0RKAt2A++uihzy97TGLWtJn6N/XuHQD/qRYavMvKKF+Inq9EoFBTy7Uw== X-MS-Exchange-AntiSpam-MessageData: 6oo7nMjidudyRvjIv2jLbaiueYmLs5s7cX2dbJoL0J2uOFCi2sFdlI4crU4F38nZwpAT3bkKUhy/ltivhhofGIEdR1TZdncSNX4y9WFxGsIYXrFuom0wN2xf8JBNCraCY847xPrXs3TyGGt+3JF/Fw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 029693ea-f404-4013-3f9c-08d931384661 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 02:33:22.0682 (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: HE1EUR04HT088 Subject: [FFmpeg-devel] [PATCH 26/41] avcodec/adpcmenc: 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: ININaw4jWQmu 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/adpcmenc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 244a562d41..ea9f76ab2b 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -982,14 +982,14 @@ static const AVOption options[] = { { NULL } }; +static const AVClass adpcm_encoder_class = { + .class_name = "ADPCM encoder", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + #define ADPCM_ENCODER(id_, name_, sample_fmts_, capabilities_, long_name_) \ -static const AVClass name_ ## _encoder_class = { \ - .class_name = #name_, \ - .item_name = av_default_item_name, \ - .option = options, \ - .version = LIBAVUTIL_VERSION_INT, \ -}; \ - \ const AVCodec ff_ ## name_ ## _encoder = { \ .name = #name_, \ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ @@ -1002,7 +1002,7 @@ const AVCodec ff_ ## name_ ## _encoder = { \ .sample_fmts = sample_fmts_, \ .capabilities = capabilities_ | AV_CODEC_CAP_DR1, \ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, \ - .priv_class = &name_ ## _encoder_class, \ + .priv_class = &adpcm_encoder_class, \ } ADPCM_ENCODER(AV_CODEC_ID_ADPCM_ARGO, adpcm_argo, sample_fmts_p, 0, "ADPCM Argonaut Games");