From patchwork Thu Jun 17 02:32:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28499 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp74542ybk; Wed, 16 Jun 2021 19:39:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEhK6Q3u0gHFmmNCe8nI7OxJUYKVPFG4q9iSaHCOYLyZf5n5inMQVlCCBZ71Z13yYx4aNW X-Received: by 2002:a17:906:1c4d:: with SMTP id l13mr2578318ejg.531.1623897547240; Wed, 16 Jun 2021 19:39:07 -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 j15si3953490edw.0.2021.06.16.19.39.06; Wed, 16 Jun 2021 19:39:07 -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=FrCwd7Vi; 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 3323A68A02F; Thu, 17 Jun 2021 05:34:04 +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-oln040092075019.outbound.protection.outlook.com [40.92.75.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0D4A689F27 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=OahJsER7nt9LbWPOY79DMMXFPxt3h7Y6rF638szpUPRYsvCuy2ZUq1YHtg4u+Jncrbv0DiRolGR+DO7horcVEnTps7j7+UrS0jrqCgHTdGP5Bd72yBMnPItOtKrje2sL/hUi3suNx3qhxmcSp+KBbI3V3r22nkxK2em6rmyhFXoAn2uagMn2LeXA2hmvJgCn9rmghfSYM/6XdOUpraRzctGRezxb+mhlkZgKSOckjEADkp6SIExg9IkSmoTjbRmHkyvxjA3sPWAIp3kZU81MIWgolmAxlUzUBPm12usAgEsi34ELEzrR/BnRHCsMW8OVBZ80sADqSv48LeuzyDJ+VA== 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=xdV0ECgLCQ9F/zpQEtUTG3cXTMRCszjcLNAGMvY/3TQ=; b=WTS0sS4LMb/RyNv0XZGDSveHvcCojx1S6rjmVDCaFRtTl3hjL+aroi0BtFo1G4vOEGKVTua5DBsccowSXHayRSB9hgKc2j0C4lRUXbwp3rSInClOGj6vR9H4u/90p5Vh5n6dj2QeJCqx8pPt622VuJXDbZ2F6/cMZeFXSIH/aVIYLlsTuQPOAex7/Ti4FN2avO6aKmPctseEEgaLKjatGPAPf7Nh+Z1qC2U5kLI8Zx/3O2UXQJ0ZchzrufVZrVeS8agmxZMQuWHvKubTealF0uZeQ3OWoXdVWIShOWimWN0a+/cgqF2EzaUFEBTNcpWKvSC0A31sHJktkdpcPMPY/Q== 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=xdV0ECgLCQ9F/zpQEtUTG3cXTMRCszjcLNAGMvY/3TQ=; b=FrCwd7ViXyxtpZIjygp4UQOZi53q33ohEExuTvjB4YynvF0NWarVIzyUJ75mgPkPPG/LBT5RYlLFax8HHjdsxP8GPQ3Q+5BVJ2BCSWZ9/3rXdbACvSd43BYAIT2XEP/QC8Qzf0EyZlKutZdbbxk9EZ2X2FCdZZFkiF5hMNCIJq+0FgjtHlAzUmuNRqpc7AFH3u77TNmZKa/7+GUGhBEz73d3jcCBw/cZNj1HQw5nYNNhb9SFh5Wlm7Y1Tn7+wzn5nyfP3N9CcFnczBzVHDpw6c0QyaXyJ9RjHC1X07cjDWQzf6oEVxDTmX6AGZGs6SgNJwGm3Jp+2lMEUmDO94/HRQ== Received: from HE1EUR04FT053.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::47) by HE1EUR04HT230.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::415) 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:39026763456E585F7C670E8E5DE6953FF02FFBEA58185C2172062A009FB6FF63; UpperCasedChecksum:EB8DC6E284C6E81D8998C1FC1EE3D523DABCDF24DF559CDBB7134101259D57B1; SizeAsReceived:7768; 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:32:00 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [lOBX9S8h/ux5VDvGjQWWATYAsIkMPHKV] 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-38-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:29 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: c71680a1-7b31-4fb4-6a43-08d931384af8 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNU/fTcAoeunGvvJC2vgMUdOXs+wenOnHRCZn5MOonaaZYMJbVlIVufgbBRJ5eaW9c1W8wf9qQeNbI4xw+PeFPXKUh+3GItfpJe6nH2Oz97lypig11/V8XdY3V/Qg41Bxwg49DIitBNEzbqjbBJvieZoNOnEveJJKlnNwOjPji9NaJq4kmu4AspbPeN1o6VOBaQXwKKOO/hlpGXsIYQGg8yVvvHKBgm16FPiHU8+kfZQlznZYGIP1O8vIz2cLipzoXHqBgWwja8WFN2BXjpJKohRVyHb9KHGOiddCOJk25ASRP8Jv8e2oYqHf4275tV2csODwkkQgKHe8Ldsk4/xYHgxkSOvzkUxK1i3f4l/RF7ZYCrm0VN+afxrHFobeokPHJWHNM1QpF9TTLOSXKt4126l0ep3QjrHFPChnoG5YLM9RHzMWkXCmT1zXFYywkpdkn+co/kpZTB1c2wrFBd6WyQ0Ss1NviXJN8WawAPTtd3X/sTAkb6ISFOVVFvM1H6bKszjLpxBTWcNJ2H6Togd5t3kzEHWNLIZG93St9HemrBJkcgRwCBciETmtYNpYoOz5LPao7eMjLO89jBl1bCh2vnpSwscrMZssxUmHiHR+lcf9PbD11XBspvrXmmvJ0z2XRjbKpEfpJeBEsyonBpzhY/rsKb7XPucGTx+tsBkCfsePdJ7H6MMudHM/9ILWVKHrR8moW6ZrDpcN2r/MasDbMm/zvpoinNWhaU= X-MS-TrafficTypeDiagnostic: HE1EUR04HT230: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y99Saw8xVwvwSYfaTsfT3pTZITD6TWXhVcVDSfD+xyt5l/dOOmbxJcZiMFh0VG2BboFuYThZRTYZ+a0qlR05LkKVi+OABE5nq7b8kJ7MCCuHpph+s1S64PuQAtPJkRrDmfMnQnGp/SAmJaGC+giHCthzFjkFeHYEWIWEejQEf8iAjmFPemD5Vv7AtpgYuzBaBSJ7uSAjfUdu+boaxmAQoYkLRHtcS3Y77ewU5/UJDzqYOx3iIgIx9rmH1/Vb8QkOa32wvdzN0WQuQWjwnHY71Ba68xLvtcbXUYAOTW8fO8NEcYuQeKuy77vng1xX4ENtXpsiAnZGKuiul3ksU6h4A+0W1muvDkWRUTCWH1ZxV/YUMjahDSjnK3WHXK8fsBlbttbjPtsFz/c4pSDgE+TI/Q== X-MS-Exchange-AntiSpam-MessageData: 5FntQpARuOxPtgY4FD3flV8o7NlV6MaGXeu6KYlMsTiijzHLuBmW7WasehBJL7UPB4L+ZIzOapHDRu645Z3KI5r0pARGNTgH5jZ1HX4MqARhufAE2nC62YKOANKvFb6tCcvwM7BfSFXMX0Lsxn+uJA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c71680a1-7b31-4fb4-6a43-08d931384af8 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 02:33:29.7368 (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: HE1EUR04HT230 Subject: [FFmpeg-devel] [PATCH 39/41] avcodec/proresenc_anatoliy: 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: Lbge0qjipt5s Content-Length: 1687 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/proresenc_anatoliy.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 3098b9db05..96c6f6d469 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -931,13 +931,6 @@ static const AVOption options[] = { { NULL } }; -static const AVClass proresaw_enc_class = { - .class_name = "ProResAw encoder", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - static const AVClass prores_enc_class = { .class_name = "ProRes encoder", .item_name = av_default_item_name, @@ -956,7 +949,7 @@ const AVCodec ff_prores_aw_encoder = { .encode2 = prores_encode_frame, .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_NONE}, .capabilities = AV_CODEC_CAP_FRAME_THREADS, - .priv_class = &proresaw_enc_class, + .priv_class = &prores_enc_class, .profiles = NULL_IF_CONFIG_SMALL(ff_prores_profiles), .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };