From patchwork Mon May 16 09:51:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35787 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1453517pzb; Mon, 16 May 2022 02:51:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8XN0mHsOfcorRKNssO9/ZHoG0vK5cYkueXfPKE9arpQtJWLYNBLjwH56mRb/5VsxRsR7b X-Received: by 2002:a17:906:99c3:b0:6f4:a9d7:6dac with SMTP id s3-20020a17090699c300b006f4a9d76dacmr14592065ejn.85.1652694697226; Mon, 16 May 2022 02:51:37 -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 q6-20020a170906b28600b006e89c06638bsi9342950ejz.492.2022.05.16.02.51.36; Mon, 16 May 2022 02:51:37 -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=kWRuJWhx; 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 A4F3768B0E6; Mon, 16 May 2022 12:51:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073056.outbound.protection.outlook.com [40.92.73.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA83168A3DF for ; Mon, 16 May 2022 12:51:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MxVSoV5RMv96PvwdyXOoY8oPUapxBrtKHOOahmnCSq/szztIHgOGhbvD/Hvyqk4Stywxvo5LkNNP9xhS1CmxEr7O1WEq5otC2onzlHns+EX6kpMmR3a2oWHRm7k/y3Tla55wU9tvu5hC3lEZ84/rUQUESkj8/2cX79F6KWl+U1tPlqUGKmteGsWdMqEZVBWVFeM6asZVfRQU43A6FsU80zMCmFGHJZQ2kGnXH/WCtQVJcqbBVgS18aZxycZZ6FiHDQjyLb782zQwO0Q1HRahFM2d/+KIcaMqGsUrEBY4MndAQP/EyUrnsDrR6e4TPW2D2UC8MMGyb85Sj4vbuJpS6A== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5/W9xaqr2+VkN6NcqdmQDci5EWQKnj9UOBOpAnzkCB8=; b=E4EQEDN/6dU0MK58T48gt89VwyHENXTDwyakaoje1q95dTFoJcGyKCcxTpWiUkQSwOZWVw1OkfV0phP5tGKRSgWOWEFhIQaITvdkCwAcAskvWzbcBFq+PRJbNAO+PnQS4EpCAteXgHxVTwIeTJz64tR8oxH551ZgOewmoZJOy6HHzH9HpBHYHx1sQFGD0Y+7XFNQXfzbXa9eYV4I50i92M5jDfxhKTAm5iGccRYLyaP3Xaf8/3wGlY0ju4TFBt1WlMd5TVJwF2JdT7ANToVD989QIJvJNl1VN9Wif1kssiYD6TFpm2satbOPD6UWOZTfCeHNaSK4m8IQ93zX6IcUFA== 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=5/W9xaqr2+VkN6NcqdmQDci5EWQKnj9UOBOpAnzkCB8=; b=kWRuJWhxabwxL9aKWLULwiK2KMYleF5gwniRRTPq2/1cgN3ZhMmjZjtIz6eAcP6MgVTtk0LcRku8F1giYEAS8gPyvpTeUp+TUdNvCQuUZgH2wfoC7bLq77D6xQEhv5WxPYTp/nczAJBX9KKJsEVS/GpvWeDlV9B6oOd4sR822c91AFehB6MufCxUiBsKFLDFDnoJ6NFu/vrKs18Yv3yzIGlt66lue++kl7v5F2FShC0UcLD6m579lKGqtxrEogcyhnPjUwyEY6ON5fJ0Mc9Oyn1qARqD5GoxA8FllZSDehYkqBXf6BvcZsL3DWkLRzz7bRUMkenmePEI/Tg+EAH1mA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by HE1PR0102MB3145.eurprd01.prod.exchangelabs.com (2603:10a6:7:89::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.22; Mon, 16 May 2022 09:51:27 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5250.018; Mon, 16 May 2022 09:51:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 May 2022 11:51:16 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [wnnDfSNgwfsdxk7f0C1CrQu6rgQoj2xv] X-ClientProxiedBy: ZR0P278CA0171.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::9) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220516095116.300899-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cb78ce1d-02da-4a13-afeb-08da3721a515 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNW7ZO6S4gJQgLWpzwWy4FXxhz8lCh/y+R2WNGRE9eNMwODCJoUTt6oaH98Q8SBRCe+Mt3a2/RisbLt14urh6jKqJpleMdFbR/i8OyOn0In6P34B7ap83LBZwLlKnte1uikU0nLHaN32z0YC6wOvjtgf8EpX79felX6TYaSNLF7r41PSY/NeA04N5NGLvJbWDZKBZFhj/Wo9INSMcMfPKUaZiRrmt19BvqzBGwpFk7oMpwn+q1R6siQhiZL0p2wkPkowPeoKwcheg3j66ZjjXGTP6JiLbK86BjlXkqlxpunFSxq5a5awdc4lQlDAfAiV47CDC8Tyscj5cIzDELzZTBDpEo2Yi1+xqDXiXNYIswj2L/++Szb5A/ARMb8biAbJ838o8U7Pe86uDG+prBDjIA5aD0T9gml680ccNfnk7H+HUSAOgKStPuONspu8Yvuseua6cTGZ2WmQWza0X+1tXH8WtBvvUV3ptdm6T1/Em65gfetpTUYYG6XzuwJ/4/YyOjeIi+IrLj2PavBTpN/kD54sVrxF1VYY6hvCGmqloAShLFQ/KsUhVcy0NNgmM8nZ+DduSt4CxvafWxVkmxaAs0M8qLkEEXCEqBlvnZSAD8NRJZSwTzSwoJi+N5H+C8PexYqvvgOHq3xMp8fsQ7rFKZ2G1jZjk9GpoxTrQYh3NZuBw07iYhQKyBdv+7IECuxeBpeOThdGdmY57AJe4nYHzZqQ1hQ8qeruIXc= X-MS-TrafficTypeDiagnostic: HE1PR0102MB3145:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Pfb3SvhH8lZ9u6HUvMGpYh7M3iA6ks3c31xOfr7BrStb9hQPzfMsl6tJuMZF2c36heftQ6l7Jg7j/UgwFbwEVJihzGzuEjP9GPQ4WKJeIRjKvptZSWdT6fY1ZvQnSTTD0K1SRTkj8jNCH3JcrAS0Y36ggJiZivgBB6o5gSzgOLxWRiI8MVFIxPXA1mxQ4npQOoar/liyOeltKBP2EBpob3uiTJtHpaq1v7+gOZFCpjkI+SOKuFrR5UC6wDDv+jmiKQ8lEHhOk1b4la6+GMo7v2JAO8GlWvALfblCqy6vSOg5iyfJhzhQZa6zZD6bZNu3bnmL1yiZTipBb+ljIu03+5GLcPk/ft2XAi4XbIoXFnWJCRZ7EbT7qTHMqw0u6aaYrsg9FiOjfwaOb6Y5sQ10yS8Th1oP3Fibj3rrG1CJJqSruxFy5CaxnV0dF1tpiCwyhtsyNha9oCLfZjYsd0GW6iXChUOkOlEnY33ZNSaou86+z5nwCmev22ONPNn2Mef8LEQkHN3fbDT/BDcBhhwZZUiZWfkVoqjG1xbZ6Y6/zcpPR+3ry+Q7Vt9KSIKR+GGtPVCt0Rjj7MA6O3dRD/qzuw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +wuddV81joDrJsYgp5Jze13V8zjOhs5cDAe8fdkRUT4PlNOcKss4bCxSmYQe1uzSlPzlJ5P67ImByEeZGdEa0WDw6VxcdpFdjJlMSFjMmSrk/bL1rBTW8+soRmwrlFOmikbhX9pmpuNpRxkw2nWSLzi/UPZQKo2J/vTUqvKVZcFsG03HZWNEzgYQrh2uP6eQwHv/b0TzKgUDWNc4+//y0/fT4YeQwKZe95jtaOnL6Iq1/dBnEHBt8/CXKECdHbRUBexJ9Vm9nxEuuh2vaYip0Az5HcaJathP1DCpsBS51Nn9HENhkGr6c2gUajc2T9vlW2RaK3b0rr51b+Fa/qVjbb2g44KRNlcAEut10WJ99MYKSvDIg3I2OxAoyOe5hjP/3eWNBZIccQ2+jBbxDzt6TgSFgkVxCAvBLw6BcTzkE9xxCeSpz5griB8aDHQeAz7pJiAY5rx+phrDuOzNEZ7L8FFOb0xU4tZeR3MZkAuKRa1tI5oA/HxyI/fsFGyH+VIrYwzDFDo4F7KosFWsmiraCv9ntNg++z+yEspxP4sN6OsQ5sG5YdxgREee5yPAQXh9snR+hFVSe3T92q+Z86QLUKZgulRRwoKF3f2fKWH+2xhNMG1lahzdR8kzRuk+SyMu6N4lTd1eqbFiisDubAwlWX+FYtvnsuJgMvcDfKRbk/8+6i6fP68Xd+zHaNYAGjqj3aUIAUrJQwjlnUqxxC5Xq/EB4WH30cKpcbZ3RDeWpMCQBi7SchuOjYVwORbdKkaqFCN5HJXNg17CbJxqBchNZcvSmg9X89bY++z4D99RmLDeyuuCLWlarHSKYvq5DTz12ucziRjfAEUNL4AzxPevFlvbo14lsSFsxO+vMw3FmTWQrmbkKXeOVBa++DWXSm7C4N9Vttk/EXXgCVbuIvTkedjMBc7ddCSfmTflvz8gdM9I3jrw2HrT7AWwl+kP0EbPiu6K90WlFqddxvo6QoAXk8DW1AtPga1aK+dBcgF6qBnmfq37FV+z5++lEJLpILaOoWKpi6yCPFfne7sunEsjxruQBJDS2OWk5hB5eVWgHllLC+/zhCkMWSYlquxf4s3mwovWPwV+YtTB7/rq+soYQPKqWoHquoYMYs7CwdyFMi0uOyn1ieZ7XjDmb4kimkA9kYu/oDKnrjlAh/ZCMz3YkVwmQ/Z1Iw9s4qx/Ja0CbTdB3qNSqpYZOtLow1kExUFCLpjBGIDYVF0m4tYUiiVCRUL92zggpWRSJ2fi1fjxxTKGOgX/vDP5Daeiu7WAnktvcL55jCAe4Mnb6bfOrMqULn8Pdlrik6OTKVC6kQTx2RLkK+PS4SUs+96bi2v7iC5ixEHkHilQyLkn/siMh9RaYpGTHPsaU/BqiUQd+CIJfukfJMHN9VT3rejgg2RAWj70XbiRdODDcqlgJCS2FQBxTVhekW1ykqHLqeH7PyjFAnEmzBRw4v0q1eY3mxPgbmPRc8Yhbg9TDw9EBwCEgIJldQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb78ce1d-02da-4a13-afeb-08da3721a515 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2022 09:51:27.2269 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0102MB3145 Subject: [FFmpeg-devel] [PATCH] avfilter/formats: Constify channel_layout in ff_add_channel_layout() 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: eC9I8e0jhdUr It copies, not moves the channel layout. Signed-off-by: Andreas Rheinhardt --- libavfilter/formats.c | 3 ++- libavfilter/formats.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libavfilter/formats.c b/libavfilter/formats.c index f2c474e279..e8c2888c0c 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -464,7 +464,8 @@ do { \ (*f)->nb++; \ } while (0) -int ff_add_channel_layout(AVFilterChannelLayouts **l, AVChannelLayout *channel_layout) +int ff_add_channel_layout(AVFilterChannelLayouts **l, + const AVChannelLayout *channel_layout) { av_assert1(!(*l && (*l)->all_layouts)); ADD_FORMAT(l, channel_layout, ff_channel_layouts_unref, AVChannelLayout, channel_layouts, nb_channel_layouts); diff --git a/libavfilter/formats.h b/libavfilter/formats.h index caf23d0792..22224dce2d 100644 --- a/libavfilter/formats.h +++ b/libavfilter/formats.h @@ -180,7 +180,8 @@ av_warn_unused_result int ff_set_common_formats_from_list(AVFilterContext *ctx, const int *fmts); av_warn_unused_result -int ff_add_channel_layout(AVFilterChannelLayouts **l, AVChannelLayout *channel_layout); +int ff_add_channel_layout(AVFilterChannelLayouts **l, + const AVChannelLayout *channel_layout); /** * Add *ref as a new reference to f.