From patchwork Thu Jun 17 02:31:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28460 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp208400iol; Wed, 16 Jun 2021 19:48:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxq8sClcvBrMkyme4T6u393EcAL8fRzus9EOpegsnNbBEfV1vzTszp8o332KiVZV9OZXk29 X-Received: by 2002:a05:6402:22d0:: with SMTP id dm16mr3405921edb.123.1623898087563; Wed, 16 Jun 2021 19:48: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 m12si3935113edi.558.2021.06.16.19.48.07; Wed, 16 Jun 2021 19:48: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=bhQpPulc; 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 7AC6A689903; Thu, 17 Jun 2021 05:48: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-oln040092075075.outbound.protection.outlook.com [40.92.75.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C1B0689829 for ; Thu, 17 Jun 2021 05:47:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lu8G+g9/+tYpH4vqWg9jkjbBx0qtadO9A8C34i8GoVPZ/kfd418CYVp7q0pq1KaFyZA83yr55Pg9n6MmYYYeWLV1H8MsaMe2e+soo3EXwDkVyDFZY7jRNPU9PjPQ2C6048TwrHz6HuYAwAG1Nc8QXeEHsIs3qUHXU7EVVzLmcsJl9nldpfGsU7alhw27dHW6xheV589a2/744aUDF3Y+f4GulRlLnfoNPKBilaO6BCrAS8957bhoIzl/ShoxjxtaZxKn3wiFoUf5Cm++smsGFaznUHx9OcC/jLVQvSNDhTUq45ch4V1NC0FqrnK1t6ebqSOevmGEH6RVGyZ4vXjDOw== 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=3YP4/frPITt5scrIhJi/D5soKhX9NTz0KIDnKStD8P4=; b=BdLBKYcaToOZRp1p/NLxNct9sPXoblZCgrR6nSs4BLgEYlGdbvoTtBpeoikU8yqFx93370Z22V94Evyqe54hYsq2kQ86ohWqrD2nK9EEZxr+b0IZrPTQNw7AOSwEkVOEhq67Yhm5yxdJqKcfrcycs6v1TF4oqLdyFaYjV5WrObtxHQt4+JMJ5eNdErRcUYlqHShywEXKdiK3eZU/kcW72NlWShHV0dQnIWVoxLwx1Q4Qqq4fyZSs9mszlH/nGC6vTl9upbKurx34m4Nn+lQnVU9e+Xuc3LFS4hy+it0/dUc1f5g+roeWxbcTNrdlMIIWFta9iK1g+yyTX2CQUQYL+A== 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=3YP4/frPITt5scrIhJi/D5soKhX9NTz0KIDnKStD8P4=; b=bhQpPulcvPTq4XVN+KjKFYlZ1SG+8kg29Ijil9GWQ0IPigcMa9YfZIdWXaVEWSHkc3BncqbI+srfH2q6kZdE+j47mUMNTum2L16DuQyldNJozEr9aDvlFMXxDQ/qPHbm5PQFbDSh0CBkU2mQq7lk6mq8F7UC1yw1GTFnKCKPKLtEOiQzMvGJeuO7AqBIKmPcljnd7BN0lfhu+8m1AzdJHVvPvL4tYswFc75eEHS4twyCGshsAMSWUZR7BmPpjXf1MndoD3eQ68ZNLrVFndIPXmZLMBlL3uBy5BnXGshgnRN2HhK8eWC+1/31HM9CHKDkvHztycrSbAQDaxx65VMCdg== Received: from HE1EUR04FT016.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::46) by HE1EUR04HT128.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::223) 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:10 +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:10 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:F9C53BEDE794DB1D6C901C8623FBD36090846DBDCB28C1F732191114EFDC24AB; UpperCasedChecksum:C36A2120DF54C1A5AB46FE5A0896801DCF9557D6BBD6B0ADD325DA911283403B; SizeAsReceived:7579; 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:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 04:31:28 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [Z3lzpXimPyQwhGphjvFG7iNvn7EU77gK] 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-6-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:09 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: ad68021a-749f-4c92-cac5-08d931383f91 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNU/fTcAoeunGvvJC2vgMUdOa2cpHb4x1SebfA1vpQG9bnhknJ7ObAitBhUZTc0j2BMW1ZNkCvUtG/6zRiFMQITR+N0i1DjxGcM6Obzy+vXtJCLFcE6AFNGInOMTS/+Y3nuea+frV3Vo/Q3UWgsm1+w6eZLfzetTMzUhELXf22kwd4glK5aglyXGB5RrB0YraaNtTRNI2ZIScd3+vd3rY3f5cMDtDmiPID2c5oqMVbOmW+yFgC8aHGn9p0d3KVygAOzaTpQ8qr9yv5PNnGNgYpsf7l/Mz/cUXrhMwnm3tkIDa4dVCyRF/ubgLX27IH5XbyFQTzBGzvbZ7fy77BYP3172W2LgVyfjF8W0T13Pw4r67540WX7PFqtCUDM2Aj37gGBFjFtnPirfQBZA3Du5TkU2un5MUSlkRIzIT2wwo6ssPvGyzYMjf+ZMsATnej5UxcejG9okfk/0JNaiMGHJ4yHp8JKUt/n/OqLAR6TmoH7xDgun9KoBTdEf2V9tNPpr6Wf7P1k3CpIjVEdDQ0QZw8JCEP5PoI2NY2v8cvKxzimyZQKW4HieDtMJSBFcVRmlLcjtwa6ypi7ew9CA2DmmyqTFfoTPdD0JBC59vBGSuE49UV+jQjtr+/PJO2ou8Q1LkdCclBVDDA7v95htBz+UMyjyYy9f2eWKMsRBIUIH5e2bcpdZ4AehtD2laB3ORkInXkqhEYApkrIJifLTWF7+KFEkOR/+3fxRypc= X-MS-TrafficTypeDiagnostic: HE1EUR04HT128: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j3wtjmuNgyHVNNZcZvyJmaf0o5ZAJuoNVQim9kth8fIHiL6uy+jopVs7lueZnRnBdxQls4LMT0sMWOrXp1T/C5+qyR3sWA2yhAqQ4vd8Qb5ZRoqOhrPjr84tHQBAziS1Z92kPfhROjBl5x782d/in39VdnzuM6KiumPtOckaR4T6heNl+pXlXZjidHcX5uBpW/8hVl3XPesAjLOcGmdNVMtcS3aMze9eikpT37Kko1y5fzQ3N7Qjzd9bA1ou9L5QQZVCCuzV3xm42WO5OvthmymZ91tTgScSrOlUdv5/AwDLvoNriYGc0hpi3VButLCcO7cYDA3AnKBPF7jKxq8A5aAD+4TP8T6kDbnbiv8+FV9DFCR6EZx713p5i84IpWF008rH3xsJLK0F6ERXAf0CdQ== X-MS-Exchange-AntiSpam-MessageData: aei1EiZW1DKvhtptUtcEkWV3fgW/jy75F29Vehd1FGURyDgAZctVLZoOKd9ZhMDibv289iSZ67QVSBa9W60XkKwu582lHiSzE0qFR1s6A+Pbo8HAFQ9piiOOHRw6yxtbC8TD252q2PRG4teLp8e6jA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad68021a-749f-4c92-cac5-08d931383f91 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 02:33:10.6073 (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: HE1EUR04HT128 Subject: [FFmpeg-devel] [PATCH 07/41] avformat/flvdec: 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: A0HYU6eD0wtA 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/flvdec.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 60d1a5c654..b4a419177a 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -1365,8 +1365,8 @@ static const AVOption options[] = { { NULL } }; -static const AVClass flv_class = { - .class_name = "flvdec", +static const AVClass flv_kux_class = { + .class_name = "(live) flv/kux demuxer", .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, @@ -1382,14 +1382,7 @@ const AVInputFormat ff_flv_demuxer = { .read_seek = flv_read_seek, .read_close = flv_read_close, .extensions = "flv", - .priv_class = &flv_class, -}; - -static const AVClass live_flv_class = { - .class_name = "live_flvdec", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, + .priv_class = &flv_kux_class, }; const AVInputFormat ff_live_flv_demuxer = { @@ -1402,17 +1395,10 @@ const AVInputFormat ff_live_flv_demuxer = { .read_seek = flv_read_seek, .read_close = flv_read_close, .extensions = "flv", - .priv_class = &live_flv_class, + .priv_class = &flv_kux_class, .flags = AVFMT_TS_DISCONT }; -static const AVClass kux_class = { - .class_name = "kuxdec", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - const AVInputFormat ff_kux_demuxer = { .name = "kux", .long_name = NULL_IF_CONFIG_SMALL("KUX (YouKu)"), @@ -1423,5 +1409,5 @@ const AVInputFormat ff_kux_demuxer = { .read_seek = flv_read_seek, .read_close = flv_read_close, .extensions = "kux", - .priv_class = &kux_class, + .priv_class = &flv_kux_class, };