From patchwork Thu Jun 17 02:31:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28428 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp199253iol; Wed, 16 Jun 2021 19:33:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7rwKXVQUD0QvjWcIsx6Zy/L7qTDsRGeqmGoqa1FYY9tJmK/MSN00AFFrkrlIaaFkpXqo6 X-Received: by 2002:aa7:c40a:: with SMTP id j10mr3344148edq.59.1623897187719; Wed, 16 Jun 2021 19:33: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 jg29si4302850ejc.268.2021.06.16.19.33.07; Wed, 16 Jun 2021 19:33: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=hbyiWbGT; 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 360AA6881D0; Thu, 17 Jun 2021 05:33:05 +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-oln040092075051.outbound.protection.outlook.com [40.92.75.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B7D1687FFE for ; Thu, 17 Jun 2021 05:32:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kB4z3+7sN8BQYKGariloVovuzLwvpS080JIbSkpvJwzPuzg0F3hLhEHqBEyZrfzGGYrAU1A52pmZQXu4e2q//zRvRZnddT8RO9+aW8L/9bM4oKlv0HksiurUMdaiCXJ1/hbUsj+Kf8PxFwCziQblikGLFZV7m0pIhJch8kMXhRuiLXFRFhhxjpWURnmVo6YvfAaLGTla5PgDlu6K0OEfslpleVk7ndmEEqocTaSRcHuCw3rdFPym9R+T+SiGOD39+yzQXtYsDz3IrUpMtd694nX6WGlkPaDFSFsBu7k2UGSLCrQUfX/80LAkCwOItAM4Dwxzxgxh8jnZ3VyuacwHyw== 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=QWcfpMC45i8QZ1km91My3Qf9KrCt0PN9kztjLDA04Z8=; b=PGHzTdd+njqfw4NYrlaTH3dtDvR1teU7DBb32hWdV7rw4iwi6nBEHswf2psqDFNPEGyzYRo5Oop1Is//EVHVvmi9UviY0ArRE4X3jDtbiWf+KFe05pdeyD+2QU0YCVMldY1JZKRBVyJdiXQvVds4MmvoSbdqXa4+Sq9lj9j2y79f8oG063RkoFVEd9tNvT9NDMMyJ8EubypVZc1pD7eklZzy4bD/PziRPfyHwpzn0bvLKAJb1Ti6/sRrMKlCF3q2hi0TMXo6dw1jF2d17ZYrd/0vSh2LiSjup3n1t5XXDJOc5GgkBK8gXeSGiBoIwEhZCcHGHFlO4gxLkOOmNBua1g== 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=QWcfpMC45i8QZ1km91My3Qf9KrCt0PN9kztjLDA04Z8=; b=hbyiWbGTw/j/rJ00DWuQct0/Gx72cd5C3SRqwDDvP5CQfzPNszfumiyEy/etqBit2d2dhsjpXsnNNoCFDnEdBtyVer/FTsGCLcjxkG6rXxASNfFcmfrQGScY69FYK9nOZUXtOXK/wsQOML8sv/PgaOsCtqOtP4L4fwEKb2z0fQdE3iiDIIUC3qVejsFcYMdF/X6o3D2U3z9l7wVeFqjgJT7W15MzB9lsMZh2ST4k3ZLwfPi8CyAATaDZmGD7vcSfsQwhY0S9pzn0PZ9Cwvu4GfSNND6EiFrdwxHYKfvgfm2MDDbGc0cjMvJHSUUeFP09m0pWvIgusv+Xb0C5TIA+zw== Received: from HE1EUR04FT016.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::47) by HE1EUR04HT167.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::95) 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:32:57 +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:32:56 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:97757A4AD5D3465115AC57DA743F7A0962E32EA3C24BF47319F2C528D6E2004B; UpperCasedChecksum:4B41D5FF1126380D7803FFDD125516352482FB154591D1D08A6FC0F17D4A2442; SizeAsReceived:7581; 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:32:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 04:31:24 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [UatreUafC80EP17Jedxk9uqwlW9u8v0T] 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-2-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:32:56 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: cbfbbff9-dbf0-4dd5-74aa-08d93138375b X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/ULuBil78Tl/c0OuVoBVXnkCsd7pYOYgnEHc6MyYkK5rzE3sIfBv1ApO4KPTkahfPjWRXvWzff4qrLTgtnPXGvaWYE+I8Vvpy75xA8ztOd+BD9e/ccROjnYDc9iOB013yKDkSeqjOU7oUdDtTqT1QrLnlnwS6uO6b0VeRkKjza96kTbDoFXtnVV4hjYBimqSNFQ//bKBjhk4SBMsd3GjUO3tLUgjTnVVot4aGTwRUCQFPDGqe9z4898q+57wxfQHLLAYNmJx8oNJwo+82D0oPAI0wuN3t3JABkLl/NEKYcJmFeB7oY7bNTHwl51JDIZbHjOrSnw2YQRmAHKY4AcOcQGXXf2SiX0cEZDHjWuDpHWp+P4kZ0ryFwNqEkQIkCPbhO3vihoDvJmiA51AlYJEBuGctBhCgv23Ujy2+fjgjygE+q+THvMsCVdJzavWOxsybuNqt7C3oXhqBDowfPlxBope7mlux9VO5XDFaBY6f0VUyswll8OBVtPL2MTAxAQO09hY4NYqJjqEviSqUYe935v7xfQppU+fiv1MS3/I79Mq2M1JiuumReFr6iqgrTLpaCS8ZXE14+aB/JSWmVAR1lmOz3YrN7aUK6GF9ZAAZ2Npvy5JPKEXcU9DQjd7xbscmG+0IHTBcEgjqfZxtVplNK6s5JHqmVGEIM+urPrah2sPmBcBuv9Mbn6gbLosSDuCexw29e0h6QbJHg== X-MS-TrafficTypeDiagnostic: HE1EUR04HT167: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nauSGuYKMePKK6hHtplqnhmGuwKIFAR/QqsVTJhDJ+Yawd4bHeEePhaPHs05QWPP1ex86+Hpe93ucCDwscjEZC7cu3ukRqcqVIbtjbTJ8uRXNGBnkxNiPBv//WhyV0/8oRzCG7NBqXLcu0DbBeSQJsFgK1wFDoUmq9rEpgT5qTweRWUWe/JYET3R162UqUyH4gRSccT/oPIfpO4mFTzHyH2VJzDgauqJ00UCFk6PdCwXkULErmVgq8FtPM3mf7J4Q4a5S3sPsyKjZO24lfAMeXsTAAShLc0nDWif5E0w8xLwyeaSOG9MsuG/DeqD+XA+WL5Gzp1QyGyEyiZEG/sKuS+nPQg9qEC/Hjl785Hph4K+OzvwhtkOAseewTDZWK4YmdwqpVv7L0zgk1KXfCBaxQ== X-MS-Exchange-AntiSpam-MessageData: ibWUL5WpLD13CUNM6bTULoZpYFRQgd+ODvCB2GDPgj9Lm9jkQLO9DZUfmx1jWiKfsDSjyFA6dApLnghT976nZEXdRIXJ4gAL31NZqXw0R/iihKTjLzKiizuUT3b4ghx/PjFpOs6P7xvRKF64P0oE0w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cbfbbff9-dbf0-4dd5-74aa-08d93138375b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 02:32:56.8714 (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: HE1EUR04HT167 Subject: [FFmpeg-devel] [PATCH 03/41] avformat/aptxdec: 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: HlYFHZ8q4xhx 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/aptxdec.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libavformat/aptxdec.c b/libavformat/aptxdec.c index dca76ae117..7153e262a1 100644 --- a/libavformat/aptxdec.c +++ b/libavformat/aptxdec.c @@ -87,14 +87,14 @@ static const AVOption aptx_options[] = { { NULL }, }; -#if CONFIG_APTX_DEMUXER static const AVClass aptx_demuxer_class = { - .class_name = "aptx demuxer", + .class_name = "aptx (hd) demuxer", .item_name = av_default_item_name, .option = aptx_options, .version = LIBAVUTIL_VERSION_INT, }; +#if CONFIG_APTX_DEMUXER const AVInputFormat ff_aptx_demuxer = { .name = "aptx", .long_name = NULL_IF_CONFIG_SMALL("raw aptX"), @@ -108,13 +108,6 @@ const AVInputFormat ff_aptx_demuxer = { #endif #if CONFIG_APTX_HD_DEMUXER -static const AVClass aptx_hd_demuxer_class = { - .class_name = "aptx hd demuxer", - .item_name = av_default_item_name, - .option = aptx_options, - .version = LIBAVUTIL_VERSION_INT, -}; - const AVInputFormat ff_aptx_hd_demuxer = { .name = "aptx_hd", .long_name = NULL_IF_CONFIG_SMALL("raw aptX HD"), @@ -123,6 +116,6 @@ const AVInputFormat ff_aptx_hd_demuxer = { .read_header = aptx_hd_read_header, .read_packet = aptx_hd_read_packet, .flags = AVFMT_GENERIC_INDEX, - .priv_class = &aptx_hd_demuxer_class, + .priv_class = &aptx_demuxer_class, }; #endif