From patchwork Thu Jun 17 02:31:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28444 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp200317iol; Wed, 16 Jun 2021 19:34:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNXqpdPBfxDFQOd2yUPE9SBYayf1hs3gBpHGz7+RrShMO7GTWfNLu28k9Ge7+VNZIW73dZ X-Received: by 2002:a05:6402:b6f:: with SMTP id cb15mr3516279edb.25.1623897276978; Wed, 16 Jun 2021 19:34:36 -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 a20si4967209edj.403.2021.06.16.19.34.36; Wed, 16 Jun 2021 19:34:36 -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=UNXxr0IK; 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 C55FD689B13; Thu, 17 Jun 2021 05:33:25 +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 E62876891E2 for ; Thu, 17 Jun 2021 05:33:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R3AcWPuCX9uWbdAvD/UvezPqbuCDOYTsNu3EgcY+RIu0coc2FwaFudHTH33L1GlhI/MBLnkzDXDew+lcIIDAAjdPi2nFvdmteMyLvFqxXJtpJeYQ0CEewWcEBLsFCvwzHYm6FR6REbm9XYYyT8BRdgxyaNwUJza085XDaE2XcQg8Uoql22PPEiObWr4ickCXQyj614s0HAUFZD3vZRGjwlwgoQDm3745459Dd8kA7e/FngcZWrRvbIzJsxrN+pvriUsjkr5k5Kxx5q3mEyJJJIG2u6yE1m3Rsevug5rRoPQzZ6hHdxdj/fEcqhNeUMq/l3Q77szoGRV9FmRYtnIK3w== 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=KPAULjXOiCENiwrEFxcITI8Xd38tNf1HN54+ZIZ7+y8=; b=hvmIAkAf0qXn/ZcwMtxkLqzGDxd+jujKZ/ZxyJCOuU72OYs9q3T42HHWwIl84aJ5rTmZXMRlPHtPXqq7WTAbPwSJ1CCkoDJ8F6PKKZ7NES1ao73JnNmDSVnaJkw99TXkeS7PHN4DeXXjM1IbBEV5/fc4pvI0VISZPSBgCzVrYn36P8d8AXXFlOOj5NWNVksiBPqMbGawVUOhXqq/+Y+QvzAMUHxk08CH0mbHxgJMDooGiQRqu079oWJzr7F/gCYLB+OXUtY5pKEQ7OK/XlohYwsVKHxnJ7y9xS5vPllq5Kyc05sHgMBz9kZAIh2GdoyXi7q7SHrgCN/9r1Uv1XHSHw== 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=KPAULjXOiCENiwrEFxcITI8Xd38tNf1HN54+ZIZ7+y8=; b=UNXxr0IK8V08aRrq+0oNiEDWAwsTAWKAcCRiNMj69ubg3CtGOxj9pDuWCeUkI42aqJEH+h8m2qhUc46r+wuj0HRPDVaSBegrrl+ipYN1VolIZ3YQFXAvU/aIErU59POu2ADqzoJmGAju0OuRnBKrS47tsSrJX5Vpza2Ae0tzGCXvG/KSip/OFXpQOvjZZQSdxT75SnOEpKFUpU+7wzGIPekaR7QUDbib0weJU2PgYXxTLgtXDFM3IzhC3RNzBNr9nG9Av2I4Frr9R4dVtvgDFYCy/mfPxNP5kdov0AP3CEtN7Tt6w+OE+bkE1TqTLZqoY+gMjQf+dJlpx7cO/U8uvA== 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:12 +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:12 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:B35C36F116810884CFB1CAED47632DD2857EFDC807DB371EF3590944E1F3E1C3; UpperCasedChecksum:E8152977908CE625A9F8F338DEC420EFCDCE55E2110B6903D6E37B7C1D10FA1E; SizeAsReceived:7590; 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:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 04:31:31 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [VrC3v4085YFID2XJg0YAAEb1IB5xsSY/] 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-9-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: 235b16db-5174-4e58-2fac-08d9313840cf X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNU/fTcAoeunGvvJC2vgMUdOjqxGbwlhaK9q4t1qgCYNcjFrWfwo8Ysk+n0x5rfzeVYeJq1BXpGUDEHGTul5q0IseRwa3zHjzpzJKgolBOxOwyCR9Vilp1YUEhAA0TExZzcRjZIyw52YwcHXyMOQl54HvdxVy0kXTfICMYXSTbBJNayDVma+ypzKX9GL7WkYXUxovq6cOJYCN4yvbahsdkv4tggdNQiVxosWWTLi4MULjWICKSgxrn3cYBa7XYeuwJR2z1MgvGIajh6gJAVvzWcOdOBk7/iBBYJvTJ/i3+V3LbO6AiIpNmIpgDrYS8rabCbDLJt4i+V+Gv9Cyfsbaq8na//9XgRYTb8qPH+IXwJT9LBdyeEohix87ymQkEn7oVe2seConAAR1MtOGOTfgh+N4w1PyIqUUEmnHMRAvXagY60kram5i05UAajT+d7BUbxZE6oGmbMXCpzVUf4cRY6uIS+DVbA5Xi8TU0mpJi59x+2J4yBjZZPywgsJ/6DF234G2EE4gESiOe2XiEnp+5e/0BwT+sMebJyXwDXbFGn6vuaoIG9htGYEu0hsRxQrr/YPipf5I/o7KPFWFwma1Xo/WznSbi8mkMkRO0JKsJyw8emPFHZvOH+S/HooUbKy1zPIaV/mQIUZrWv9JU3GbJSwJ5fPgvfh1LP3it2UaVRAvQWW3jSjYRXLkCbllrVB9Xm0uKSJpQ55pokL1UHp4hQsMzU8C7GfLUc= X-MS-TrafficTypeDiagnostic: HE1EUR04HT194: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qgJpVdkGVFBs6hjUxY57MdmTIqwYY56BvMDTB0UQB0eoSeOyzkpc1hdbq8dS2uYv+IHya9KQp349TdvV8HB1iU09M3Umf2URNlufqRFHnfF4nRlxGudgXkZDuCUohAF+GZAwDoPi1KGAAvz7YKrs/LfSuzYOvOxY+JPULt/lB+12XVhgrjl/D9i3GCwfXYKXGd7ihkhLjRjfFRaE7p+4JSC9NTHOL9c6UdDspIyL62F7Ims1o0sJ4IAeflrCfO3e82sAVx+1cgH/VKtnjm8Y//y31EjcfkLhz4UC7PaWkZCq5gwTQfBalHOmz2YE/ZLRynvvoDT4ypSTiNpP+aosY1+f8OTo/SeXp3ztpuclzBGcBz0XiM16aRIqlw1ikP73YnDn+SW09wGKpI8C4zDcig== X-MS-Exchange-AntiSpam-MessageData: 480JFPjKlH2tzPE9vPGN+YwI0jsICLiEXugN+I/8H3omSsUpmkt/bnutK5+YNi4BXWXTIsx6uDEkYsHoqpxf5ElW0X6fA5oGXgFEFVsUgUjcpD4buwOpUDAghoIXkprfCECEzZomYDk9k65W5mo9Vg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 235b16db-5174-4e58-2fac-08d9313840cf X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 02:33:12.7484 (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 10/41] avformat/img2dec: Make ff_img2pipe_options static 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: 9P11rjRaLpns Signed-off-by: Andreas Rheinhardt --- libavformat/img2dec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index aaf2ac362c..55a91ca698 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -647,7 +647,7 @@ const AVInputFormat ff_image2_demuxer = { }; #endif -const AVOption ff_img2pipe_options[] = { +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 }; @@ -656,7 +656,7 @@ const AVOption ff_img2pipe_options[] = { static const AVClass img2pipe_class = { .class_name = "image2pipe demuxer", .item_name = av_default_item_name, - .option = ff_img2pipe_options, + .option = img2pipe_options, .version = LIBAVUTIL_VERSION_INT, }; const AVInputFormat ff_image2pipe_demuxer = { @@ -1109,7 +1109,7 @@ static int photocd_probe(const AVProbeData *p) static const AVClass imgname ## _class = {\ .class_name = AV_STRINGIFY(imgname) " demuxer",\ .item_name = av_default_item_name,\ - .option = ff_img2pipe_options,\ + .option = img2pipe_options,\ .version = LIBAVUTIL_VERSION_INT,\ };\ const AVInputFormat ff_image_ ## imgname ## _pipe_demuxer = {\