From patchwork Thu Jun 17 02:31:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28452 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp203051iol; Wed, 16 Jun 2021 19:38:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHTJ4NWT0DRjGlGxCKyrjzfFUEg06uNaSN9NfLuWqlGkRQsLduq3Gzc5vJtENjvwJEi7xm X-Received: by 2002:a17:906:e253:: with SMTP id gq19mr2708640ejb.138.1623897531792; Wed, 16 Jun 2021 19:38:51 -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 m12si4023925ejq.256.2021.06.16.19.38.51; Wed, 16 Jun 2021 19:38:51 -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=BUIvrhpY; 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 AF8E7689FF6; Thu, 17 Jun 2021 05:34:02 +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-oln040092074098.outbound.protection.outlook.com [40.92.74.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 92C4E689F27 for ; Thu, 17 Jun 2021 05:33:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sdk9M5S7f54BAQVARi+Xqr+j6jpfkDzGboQmLk+FEjBoJREWfGv+hBZclsfvxUvxxk7v3GqZMVtpUhOI/dY3Tiiuk7Hn9Jq0PDm6itqH/83iw1ytzuzT0CqipEZ9plSLJS/667exS8/PgHlQLtLPnvYbBWUXH21DyiuDc45Bsk4cTm/D+ERgbxTu5ShOBoj8suFybuxjiRgafXPn9EOgma2Cs4b7TuzgCU4Texk8UX4XI+jWU0QDFyjOnzXzqcKvnAcFlOxwOVfqXI3N9ObFX9ne7LNiFLaaeV1kzUCo0FQ+3w7z01C/k3ZI5dUlzmblOfPnL9foRZczOQ+wXwEtbA== 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=8mgoDsoCLUmhd2eDGexIUsQ4313qaMergTbMMGlNGQo=; b=nkYmNVbJXPwV+CH0o3ka7ikFj99tiEHifIYitKmq73NtAqO0eIMjAtuhgoGjkBB5v0UFuJKgayhtgA+7yxwMhhjWQPyJnIbC6684WYSnfsH0x1sJTXGbpOW5OFzMxHao9Au84ypb+zILITc8PuLUVcTMeLuBHu1l44UvlRvXzo0Nm+nDKFZuQXNMG4rhGHLngibxFfFXjmA2rCHdHvjvayrJBMJKnmSfvZQSi18dIA4y9O6GqCMPVL5gVvZe4Jh48Y+CNjsFn9dQBgsSIO4e8Nqre8tjliO7SmzrT66f186o/QBXVvEoOfXECL+SvJgbG5e49OAyRgup1aapPCoiOQ== 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=8mgoDsoCLUmhd2eDGexIUsQ4313qaMergTbMMGlNGQo=; b=BUIvrhpYVzbIcM0XPCI9JTpROifx/SgT43sE/8+NcTHEgDxJkVuGX7GNAe1wo/S4BKlO4g6YQQsVET+9iUZR4pubNM7MKXOIaQJOu9VAT+pRW+seLQtG+GehCBaFto+zZ7naDiXnb6MkuMnfnkEoRGSBm9BwTX2JQVHLXgFs7cXJSHYm0flpOTrUh6Os+6iqCyl95xw9IGvIbBgXhhAzV4eSgeQhzysDJjSNVN3EhaMOxEazjQl9VB5usxV6aE7tx1HU1gl8MxicGHSramfryCWaFG6Pc8i6k5aklkGg6BAtNtFqKXcXjUL+WGxgsbhjHVatoSxvWV2gNgYJi5ANPw== Received: from HE1EUR04FT053.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::4c) by HE1EUR04HT025.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::71) 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:58 +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:58 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:6D96ABC07813C298BDBCA2610197B4FA993F0776E039D9B38CCC2955822AB571; UpperCasedChecksum:8DA3C428A8D705A6FE73C45093D38D56AE01D1AC2AB70211E99290836DE1F777; SizeAsReceived:7756; Count:50 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:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 04:31:59 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [TiyzqbU3rcmrwV6965cQeKZ5YzGVYEE9] 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-37-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:28 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: e5ba7a30-0b15-47bb-4b0f-08d931384a9c X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/ULuBil78Tl/c0OuVoBVXnkCsd7pYOYgnEHc6MyYkK5rzOhD9i6Qmaw+JUo/nP0FjRQm2T9wKwUM2p7Y3hl1KSo2vMblaMtutWt04iAoGBFYPUyc+Xp7G4buYzN0yQqkKufnkcmEf4JIFr+UEfSPmHYy6m5ArwnWjVRJTkLzbBcIf86p/EOtTTDebtsatyewRDOuHzFCPGkLQX5Ecwr3pzNxO+hK20hCgVRI3s2yT7fPt2oQWbYiQM0A9ClYEjKZxbqsRqk63Hi7MACFi2C57qDteAdCL4Uxs38mQtR88rnHWSg3r5VRb3LXdAbhYPYFA78EK4YHgtKN/npq+SieUk4GrjAKCcnBVTvyjak5LabReCmWqtNHoSDOEvZcu2UrN4543Hb5jJuGiipxGO7u3+yKe7Rzu+ooyBjLxAe5DNslZ0ULR4nFj18V00JDmdCz/VkgK2lW64p6M3UsMJ/t5cda2PzP4rYlOMLrAQ/VcgrvSLwtAkyyQVArqzVG27YhZXUHoWskOX3eSP8EJPhXOv6UNtXC0oWnNkMpmM+0gUx8KloSzIAaq5IwdK4WJLI+/L9+ZTTPw5FDkbhRIDppQ0qD0W316ec7d967FU/qZgQyT2nHCt2k3pXC4BIh6F+xBeLYdtz0rwTtxr71ZSmbo6NaQPYRV3HSsJMLcLvBzeUrQUlbd8uvog26370R8l7CoG1sVt+OVdYR8w== X-MS-TrafficTypeDiagnostic: HE1EUR04HT025: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1sZe+lWDPcJcxMgz+Bk5Ytm3puS8+fOrTxlq3OXH9BKyiiqiAWponRQV/tWGylS+N3lIpzqfVMbk+0gbvsZigYkx0xVcRjfXloKV+UY1HpcPJ0MPMKvWRKfGU/jFeWwhy7IqfFIpMPEtXRn+ypZMJqMyOf02EFg5AiK8/yJ++Hhoc+tanHyGPOj4Mc00TcTGoHG2txYjAIg7iTxF/gVgRJsXGWK0ztUyUodpu+uDvzpdMZkuU88bKFGFxHaAcv6XmVFCYWQwIPzSlE5Z8VdlsdvMdXLhHQKn927KjjjDg2T4FJNrMNuhr77l6CKbdHl9WQVv1ZCTLaZHdFs5dMM5i9dKzuDIEdagzYFUezg2+Ke9JphP8u4onP9dwJTFIOhstgMCW836Vo6g1rTMIj3jJQ== X-MS-Exchange-AntiSpam-MessageData: wgZ+02nRWDieAQcF5n5Vq03SgmfxfrXuXPzrSq01IErhq0BmnnuNoazt+J7vWn2QVf+s94ZgyvnZhm+RTWl04prssJhVT4OfIeEQ/qecWuKqBNyZB7EFTzxF+/dD25YbcD+V6KIJQgxX12w4jJPQXg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5ba7a30-0b15-47bb-4b0f-08d931384a9c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 02:33:29.1631 (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: HE1EUR04HT025 Subject: [FFmpeg-devel] [PATCH 38/41] avcodec/pngenc: 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: 6IxrGVoC4VwN 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/pngenc.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 9a9aee06f9..3ebcc1e571 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -1108,14 +1108,7 @@ static const AVOption options[] = { }; static const AVClass pngenc_class = { - .class_name = "PNG encoder", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - -static const AVClass apngenc_class = { - .class_name = "APNG encoder", + .class_name = "(A)PNG encoder", .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, @@ -1161,6 +1154,6 @@ const AVCodec ff_apng_encoder = { AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_YA16BE, AV_PIX_FMT_NONE }, - .priv_class = &apngenc_class, + .priv_class = &pngenc_class, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, };