From patchwork Thu Jun 17 02:31:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28450 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp200443iol; Wed, 16 Jun 2021 19:34:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDvb3zCSdTf5KN7VY3ZyttGaMwHyZapnq111lv0vvn+HOj2ZBfB2/DNwsH23+dHTUWAYu6 X-Received: by 2002:a17:906:b857:: with SMTP id ga23mr2633416ejb.296.1623897287208; Wed, 16 Jun 2021 19:34:47 -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 a15si4183523ejc.78.2021.06.16.19.34.46; Wed, 16 Jun 2021 19:34:47 -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="U8d9/VkJ"; 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 E3559689B33; Thu, 17 Jun 2021 05:33:26 +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-oln040092075042.outbound.protection.outlook.com [40.92.75.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22F4B689721 for ; Thu, 17 Jun 2021 05:33:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PMTUkQ3nWldDMRxJPLHK0fB4dF9Pujec/tTK3QjuIYr4yykVtalN+hhOG2ZOgHDiVTvGmIdSy5tqoWSh+4PAB/SwwjOfsk+SQDfZEywvCm3uQVgTHBJV/Gl8IhD3nr0MWcm5kNBTJT++uZdjrw+yl6tHhm3w+7rMvTM7Cbb0EfRvw1MHHzBvHto0Yv9oGcjxsoZeERaKlP9VA/UKZbXbFZtIfNrZM7jBo7hZ0jcO/gUjGaeFbecrDgk9+BswkJtftcMagqWfGdg91PeKJTBtsIdl9ycVSe92ARHyLgEoUKSYl5IVNPGItQ77Fht/9MWZJK8dINfHF9JLB7UZVPE9Yg== 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=fIE2vMPq7oJWDTWGE+MLYey0pMUx0zNVFlqOT+kXbxA=; b=AmQ2hMRGs/UxbDOuXUma8xzSN6cZBtH/baYBF4GoVx7GTUpyica3cijFdYxufajiFkjdyVAt4CmP1ZE598GpezS2G80RerMnO9QYamNgpTqIc4EONbN9kF8dImgNoaYx3KgQBLCn1Xqlj+3/VaPvSG73XJUYuloG5uDNFrP2OohBevLafGSfROpUlumx45pX+x5FYhG9o3p97vB6n1mJylCzvqZFMs3uyUI712Jcfz3o1n44u3B+oaUeV7Jwoj6W3sut3ryuFJdrLhJzPY7OSRs5PFXV7u2OgOdU+TBsZb3D7j4gQ2Yuku7G4sXl/41r+B1bV8gvUuMNvLhVrYrWhA== 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=fIE2vMPq7oJWDTWGE+MLYey0pMUx0zNVFlqOT+kXbxA=; b=U8d9/VkJYBoaBOqyVZ5+4CPdDcK9SKrnM0YO9NTNEIfgipgqrXCaxsDTpONsSi0obnWX5SriUgzWXYsXzpzgaQi5IlKL20PF0YAQ9Y3QxyK1lKesYEG7vPOEevsTRN6z8aL+CYN8oqbdzdTV6jXIDvnCVYwppshxbBVuUZqrX3EOa2+LHdTbguF+0JjWjRg101t9p2DoKFXnQfUQW3cl8/Ff60HhdKXURs7N3PVR0Id+pdW0oARR13jYWW2ALVGy3DphReI4+BD3bdeyykP57JuLKDU2Ybwm2rPMPFxWRnFJN6fEL7R4N4rvxHYO9lPpXatcomaOWFIUC034BdxFjQ== Received: from HE1EUR04FT016.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::4b) by HE1EUR04HT194.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::205) 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:13 +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:13 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:FD19F357C7A1E33F71D454BC336455EF92EBB0E14C16841D14600709FA91D6E3; UpperCasedChecksum:96F1F4E65C346FD839D2BD7F7129D4392604DA02115125D84CD79C0AD249B649; SizeAsReceived:7582; 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:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 04:31:32 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [UNRJ4or/KCq9mgXV2Crbk/5essfMHlYM] 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-10-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:12 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: dde6adcc-d75d-4d0e-718c-08d93138412d X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNU/fTcAoeunGvvJC2vgMUdOtpMk4ZZjMF9jvnlx1KSQ8lQ+/EednKfLx4fFQQNBhrXl/D2YUv/jaoeWAsFzmn7hlWAUKZH45UEb+42YcNCde7RrLcKnhKFewrbhQUN7kCoGmHl2QEUHhA5ugB/b64jVPXdsBchwsKOI0bBIEhgogLJEvEdOxyxuJ6EARwJvk1b2fwg7WWBakPPSYW86+Q08SrkU79ReEsZp3g04uDxMVkukiXHsESgjyvUouwr75PdYuOJWeDxoKraGDRP/IjbNi/NjBX45Tbz3kWqdnDEVo2dS3VM4dUUBw0FvIuyRGVlZw/eBv6JxebW13Xf9AA9CmC71Rs+/8HANLhjBBW0U2K7OckDnUcxN/Xu13HOAg6tzJZRaKI1X5uTSe9dceewIxE4h2TRJWDJ/RV2qXnGyiXK4Ay70+NJ+fhy65d8qb9ypLl3veXp4aW/ATShFpuowvJwapdX3DwV8W5ZJiP4Z1SzyyWif9BMzL7ATJH81BORH73VCTd/yzpQZrrl1vhUeAT6ziGdfwPuHMnFDdsfDcdmwm/ZVkiC6+k9g69xoIreRueoYfUC1X2L6srgt9Oihd6GRHUV9PwenvK7vdlGQzestqdyhQrVUwBMbwszHFalWppF0aybuvLJe+5sWw14Oymt8BUI9DcvRTT+qXR2vZgykUwZyY7Hlkz/s1gue1lxyA4xqyoVhbJkQSlMRvGlL2PSWcg/JBcE= X-MS-TrafficTypeDiagnostic: HE1EUR04HT194: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dvwEaCXmqo8BkdrobxWy/m23BYa5K+GrN/hJlMv+x6qlqD03SHTnE9/gShoN0GPYe4CoDdotQV3Z+q4ByDKZCQBLHi6m0hdL19xq5K/5hC0kwVRcB81fCS2HtTgF8UdBeWBAlaFtto1d+z73GQK+IpYZu5tgD3Gqzp8M/HUOPY86YA5+THGbObp/k+oWefCxM8ZIXUdywT5aMSMbZ87wKkUAkY2jCwlls8V3+qMYDYHZdbbjU8R9QCppbx/vTLH/JNkZL0HKy4vDmGFC4sQ+ZIZDUlnd16IjeXLk1VJKa+VYilQMhiGAvOsj1/BrJqutMKW1lfuvncubFvtkl8goeapD98dsfCjkT3vpsblmoMxb4DMU2repnLCskTVoR9s2dpAfb35rN4+kb3keijPfOg== X-MS-Exchange-AntiSpam-MessageData: 869WqB4jR55OnIUkzRKI4fScFSoXNS3RTmQC51dQtS0qg7niP/AUV+zIThL8Z08eNoPw3pH6gK9EyEeeF9mvxRrUpdl030n495T1hVA41rKp40YHUnfEFpMW7LvzJHjDyL/YSE5qNHUEt8KBnJwkPw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dde6adcc-d75d-4d0e-718c-08d93138412d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 02:33:13.3691 (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: HE1EUR04HT194 Subject: [FFmpeg-devel] [PATCH 11/41] avformat/img2dec: 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: AhljFKD4lJcA 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/img2dec.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 55a91ca698..c9651bd941 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -651,21 +651,21 @@ static const AVOption img2pipe_options[] = { { "frame_size", "force frame size in bytes", OFFSET(frame_size), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, DEC }, COMMON_OPTIONS }; - -#if CONFIG_IMAGE2PIPE_DEMUXER -static const AVClass img2pipe_class = { - .class_name = "image2pipe demuxer", +static const AVClass imgagepipe_class = { + .class_name = "imagepipe demuxer", .item_name = av_default_item_name, .option = img2pipe_options, .version = LIBAVUTIL_VERSION_INT, }; + +#if CONFIG_IMAGE2PIPE_DEMUXER const AVInputFormat ff_image2pipe_demuxer = { .name = "image2pipe", .long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"), .priv_data_size = sizeof(VideoDemuxData), .read_header = ff_img_read_header, .read_packet = ff_img_read_packet, - .priv_class = &img2pipe_class, + .priv_class = &imgagepipe_class, }; #endif @@ -1106,12 +1106,6 @@ static int photocd_probe(const AVProbeData *p) } #define IMAGEAUTO_DEMUXER(imgname, codecid)\ -static const AVClass imgname ## _class = {\ - .class_name = AV_STRINGIFY(imgname) " demuxer",\ - .item_name = av_default_item_name,\ - .option = img2pipe_options,\ - .version = LIBAVUTIL_VERSION_INT,\ -};\ const AVInputFormat ff_image_ ## imgname ## _pipe_demuxer = {\ .name = AV_STRINGIFY(imgname) "_pipe",\ .long_name = NULL_IF_CONFIG_SMALL("piped " AV_STRINGIFY(imgname) " sequence"),\ @@ -1119,7 +1113,7 @@ const AVInputFormat ff_image_ ## imgname ## _pipe_demuxer = {\ .read_probe = imgname ## _probe,\ .read_header = ff_img_read_header,\ .read_packet = ff_img_read_packet,\ - .priv_class = & imgname ## _class,\ + .priv_class = &imgagepipe_class,\ .flags = AVFMT_GENERIC_INDEX, \ .raw_codec_id = codecid,\ };