From patchwork Sun Aug 6 10:10:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43134 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp990842pzh; Sun, 6 Aug 2023 03:09:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTpegpB2f1PDS6q79U70QJMvA7b+Br9UIvB3+Stu7EIP3irJumGIBrEjHMWmELUXRUE8ZC X-Received: by 2002:a17:906:188:b0:99b:c372:7082 with SMTP id 8-20020a170906018800b0099bc3727082mr5534983ejb.72.1691316594985; Sun, 06 Aug 2023 03:09:54 -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 fi13-20020a170906da0d00b0099bd0a03abesi4438761ejb.931.2023.08.06.03.09.54; Sun, 06 Aug 2023 03:09:54 -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=ucGdBeJj; 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 4DDD468C59F; Sun, 6 Aug 2023 13:09:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD2CE680CEF for ; Sun, 6 Aug 2023 13:09:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OGQruVXFEkdCbLJGsllLoPimmntjN7FaunSYxN/mOjWdDm9RHSUTY6cBWNNY6lHInKoT+bbgWJWslKLAdqDR6Hc7bWcbpKxyiwDZWmdjLYCWrwpimLeFEOBovloQWU4jvDQw0B0MZu5fL4zEZ+Fbz69A9Nc2flR6f98Z9ESzNNHr9rwpzb1UjiZeQCnmFGsRVe2N1GaS4JdSUiYsWUdQBGJCGfafs8Yj99nw0CsCSLvR+xxLgMg9kr03W9o4pSR9XR8T5mwNrts6cEUtkYcJ05JLg4/mjFSKswmXqWUvy9qTgAVS+XXIQTAFV3XMSJ0aFn2hpPIh5y4hPPdeplTd3A== 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=p0mC0JGjH0RAgpmRw/+sa2/usmpJb0j+nVhKwUGDwbM=; b=mADVKlRmSP43Doa2y/Fbar4D4oO37yc25ehBkwAv8+F4I+/VNSeXlkE0AiVA7CuTHn/mKuJ0LTH/cK4mhkrFxVoM/sjg/ueE9KbwrKejJ15VXsLr/ixntNVSFb71uFjv7YxlUUBEJod7h59n4BYSAeJYBg3dzk7GTF/1ASQgworbvsNtSkPxpzCCdTIdY5wqzO12d6RQSVunxM88gPEd/zpwJdu0uDW9EB+2n4auK2MipRFB3YEOxVgEGp2Hp0AG0gu4M5Ec2wm9lsGX3QOyjvtSy9KKxgrgq0qno88og1y/xUJBpaoWXSKOVcyiOpZCp4JJi1jdYehq0sdgWzMCnQ== 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=p0mC0JGjH0RAgpmRw/+sa2/usmpJb0j+nVhKwUGDwbM=; b=ucGdBeJjUHT8MtH5l37SJjwA0eFNT1nYSzFehT4aiXkaOAGK6fcFH05MRaJqrj40GTjk0LTkJJ4KIB+x5iiKpPXX4fvs7eBA7TSdEgBUTLqJhpdJXs94rau37A2iJm3zJYZ+/bVqLB38cQRnUsKJ6JQlOnaZbxl5hFykdSGYvBn7UgMI2zI4vRl+t3NIsA8TnxufueZQArKKFC5q7An1/9aj0ajoe+yvdkL1NOLPe3pXhGZbmQBGynoCWDpE0apY1qrz2wszukSYmNMlt4rsamHLZ2h6W89kSMrZw8cF3Tk/75SZt553ZgG+hijLuG9OTpFRXcS4hOvXI4ngCOnV+w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0275.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.25; Sun, 6 Aug 2023 10:09:41 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Sun, 6 Aug 2023 10:09:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Aug 2023 12:10:40 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [+5EopAiT7HdAwyiKm7UVSyPxpdnd6z19LvQ7DxyI5OA=] X-ClientProxiedBy: ZR0P278CA0093.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230806101046.2828188-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0275:EE_ X-MS-Office365-Filtering-Correlation-Id: 38167918-bb27-49cb-a6a0-08db96653f22 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3ldI5pBHi31/DNurX6P59/U2HhBiaDaNKVZNJGFP73pRmolTXnRyWjHnmplTl1yZWMHyOB7YrvEFjZBpUOF2KAa8tz8ryADIbBpat49DPmcLgFaHI/jfwRuqHydZWEzVBTojtSwjhqCB63BZaY0j/WiQADUXu+bz3l1PY0XncB3vDPFbLiub2Uv7o/+hEzGbSbzAr9BxxfjvTUDasEhZgt5xJnfSSGQzNPyYjA9DX7ynPac62eC/ZUDQ06pw1artbf2QjsLiThsX6safRAu+2S0ta/9IzfxTuJYvAO9W4FlKHlwSR5a+XIBLu7gW+ai5W7rQJwQT3G8/MMri8ecNDDoFC/8v/8ww0sgKdYmDcfSlmFLJQ7NOi8GKHokGQYi+ghFvinD7wj4G5vwKCvOs3JS/GMZy1GQv6Qys6AUPayUittcfT4P6NKxBvob5XKI52M5F6QlwgStVHLgm20D3la88Jeu2M/wDhqe4icel+68Kcdlq9LbXN+SZeCMGyGmdvbjpevcAZL5bHLcfkkJXYV7L6oYQcVnA6tRP+B7HkLyvyTwD8UbY+Kjwt73jjEmwZcMWJPAesyqaOVnK+ClyVVZbY/NZxY0emhiavZswTAAJzNloAp5iOnVMzScO+N5ROnhwEOoJvXqtu+Bq+c4PUTQmvMBpitca9+dxJwypIc2C5l8vkIrKnFx/IlEdl10PuoE0z0irzsf8fluv1dNKWa3eUASDBJOY5mKrekU2pzhnvDV3ndcs91BsLdtCrcyO7rwbXhBkArBW/LJsrbCxrTi X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dC1aBPHCiTWxpDIoMVR+2sNBIe1bsCiySCBivk4DwXsn9cn9B9L4zNNBr4B/GUC20L7Oj7egCBXC078o0d9K9QFlcHIuhO1ZfCgO5f2yu32Or0v8cKlBt0e5OU1ufWCMzowFVPBYnlZHrMiux43mFaXzX1lOjE2gcQplac1lsIw5V732NY0CSj5LkeLzL1nrHiWnUy02NRAjuP14FlYULWdKUUU9+U91/TIoHNueKCKzUKsIg3BrKeNXrLd7Y8Y05lRvIK3hbWjZW2x1vfAwKVeQ19NTc6H4WZPhtDPhyYlbS2HnMp2Zg7EKsg6I63UmTz0S2HtH7Pgbh+tYu0cALEZGssuQXdhAiC+tvMiC9Z0jCDxHQYslrqXahUdIHwB4sbdkWp/IYa8cWeMTP/H2NDvG403BoBMT3kp4eK6+Krqdcu/F1WpyfYybfRBT6ZuqESI7ptGNce/U8y45vhGgFuqJduoNIc4tNh3jEGQYaGC62Lax7eh/Dhj0TTsXC4iCSVlXa+nqkT2s+wGD3/BWcdaNK7vxcw6O4H7PTTKu1Xb6fIQBQuCFZV6FxDjB5U+izl9DRbB/2K1KPI1iNX7I12J9051cyfcK6f9ocYrlLKmbmXItTtyuQawy0sV54vVF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cbKm/PHP0F9k7lhg91I3z/rNM5mkX448x0jVS76vH9av5SwGUZYZ7M6toNGwTANLc8dHPHulr+KK/YPT5iZC5947ws2ebAwnmOCyY2MHCNjr1cqScsPICe0BBxeqB3GbQjG798cFN9t6A11ACHRh4QJ3OXwbt+bQzGdY4XJwvJA4SycoKNnjTxlAED+3NcZDd4IPwHXseomjxIne9TTx/YBuoqzPfEcfr1y/EIlWV9PAJ7pgH7X1yIYTz2nsbpxbdNX9M7BnG5HYxGgkvsgbUd3yvDXMz2/BoCY2fInTqB452+ETfKzxGYTXNWT4RrgpUJYzHZObr4CNuHFoGMkfWA87uRpzihzrK5V4Vn0Sl7SDB+z4NF/JQYYcqFzvtklTY2AJNZ7fioGwCfsZPM+MCDjkVHM++DrfDLHbOSpZyo88W0+6HaK9stNWlNO8Ud4unsU0U2ydpM2QXBweIq10xgfMy9GX60cWg1VbNsuzpliHR5+OkdR6uc5w4HxNpdlMKR6vc+1mkym8TWdqjlmi7plaTp7apyW2m9PO1VSbneiL1qXs6eI0aEuu7NemWzA5w0YNPCbfbTtUk6EgGTW/e9JnwPF/NtMR1vZ869J3Je0B54sxrmqnqq+tNHSITEtsxxaevXbesChjTV4gxlYXJgpylGe8Fg5zs0MSplUqYf8WlU8MJQe9XDuIXhbwrLyNVPk1RElt7HU108479LiDJvBrhMLbUN4C/NnTPnr06IB0sBz7gAiNimNmZNzxJiVIK1Gl1yUFN8DaiEsqu7mez1PwZSb8EYXXgNRPfkUmHvKY2jOlf9GCtCyCjL5EOR2bbNKZFiN1PExJd8BMXB3fdoDBc4hkvdtkiDIoTNTxT8RTIN5L7CkQvC8oyTQGjAWawaUfUHCEcFV18fsFGyB1m2pHO95Sl6GLe5UvSJgznQuET27Xgahli9NMxM7/S/6ETXXzJ+ZC36dGN2kVjuHak923wCUoxep8AdzVcyCXe2SguDJZGv456eUTCtIiOzAKNJqhA6ijwv3RjYXXGRd5919yeAbnoQcDlaoD8gCYiPuligCHtHwaS4+yXzXC+xV4UCzto1GMWz8DFs/aCJlZvg6sdjVx9xHDa4gdCzeD2Z9jJQ4m5H6tSsVl2ySXNBXJiOfNp5VdgiIEKH0dUr5I1f5DEyoH5Miyxu754l+thOo9tDFwQs8fG7LqQlQ6p3gRupQ4vsgMZuQEejjEf1Miv0+TYVexXWMxh3JcEvCnFHJqrftXg5IbToukhXI8xanF X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38167918-bb27-49cb-a6a0-08db96653f22 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2023 10:09:40.1524 (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: PR3P250MB0275 Subject: [FFmpeg-devel] [PATCH 1/7] avutil/bprint: Don't use value of AV_BPRINT_SIZE_AUTOMATIC directly 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: AxHulrZSQd/9 Signed-off-by: Andreas Rheinhardt --- libavutil/bprint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/bprint.c b/libavutil/bprint.c index 5b540ebc9e..23998a8b02 100644 --- a/libavutil/bprint.c +++ b/libavutil/bprint.c @@ -71,7 +71,7 @@ void av_bprint_init(AVBPrint *buf, unsigned size_init, unsigned size_max) unsigned size_auto = (char *)buf + sizeof(*buf) - buf->reserved_internal_buffer; - if (size_max == 1) + if (size_max == AV_BPRINT_SIZE_AUTOMATIC) size_max = size_auto; buf->str = buf->reserved_internal_buffer; buf->len = 0; From patchwork Sun Aug 6 10:13:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43135 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp991765pzh; Sun, 6 Aug 2023 03:12:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH6AGTJzJoFRNw8sGNxTgKYcB2uvAF6oGnWIiEHBV46154uVrUJjRzfKYsWsFRd/u4WuGfP X-Received: by 2002:a17:907:2be2:b0:99c:c8bb:ff49 with SMTP id gv34-20020a1709072be200b0099cc8bbff49mr2027476ejc.20.1691316749473; Sun, 06 Aug 2023 03:12:29 -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 q8-20020a1709064c8800b00983f3f76dd0si4497469eju.155.2023.08.06.03.12.29; Sun, 06 Aug 2023 03:12:29 -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=uZCxbWLu; 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 75F8A68C685; Sun, 6 Aug 2023 13:12:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2062.outbound.protection.outlook.com [40.92.64.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F335F68C2BF for ; Sun, 6 Aug 2023 13:12:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XMoNoPTRNaRBZiYTnWDgkfAuNCjTJ7vFjECZk7gpb67K5rDss/HPL2vx8QrOT9yobwC6V/ziDv+QyRZySO/u3qKKfZFJjhq9QEMVvjct3pm62pK9tjYcBLY8XSSlGedQhvY7nEcKOl7mn//sWHsn+XDA2zaiOvHXQIspqLuM08hYrT+A4yKQsdTK4VyRGtkG6GQ8vM6GXKCpG9UMzkZy5jNoYU6nBajKqsI4EBQA6LvubjE0+oXBmvWGZsHs7S/sNKjEy3ta33Rvbi/NjqRhZTMT4H64DSb6LcJhPoLqYCyppBIMe/GB2PijTaMEjzWq7DNEME2KkTNP/casMggiQw== 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=wloMQI50w7AjsFb3ONrHAMDJPHp57GkAJkv2dWKDDpg=; b=oKtSIzEGJe7aM/qXWbsVaBbf0kJC5D1MHm90rvdVTrE/Gnz2rLapWZZNFSFKgBQOr725wbCh/97ZyatPUUbbMB/Q6KrIdyDro2f3SVhXwQm6BBVk21Vz4lo4eoRTq9t80BSyM9sfHr5QMKLPkb5B/C2hKPRKV+h5+OdnBbLfzTYZGkn4TuEjaqhUMnmdntpva43L54GPU2YCF0QX9iLC5Ac5BqQbC1O0kXRV2+r2YnYI0S900EuPblF8MRakbziQg9xbYNTrWB+Nf/aSFivzsjBlxfms6fsXZcfJa3LuFLgcvXAl658c65/HHtH+nmoUvEVfoqSzJHCVm92Fa+2/5g== 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=wloMQI50w7AjsFb3ONrHAMDJPHp57GkAJkv2dWKDDpg=; b=uZCxbWLuE7D13IRChf0tyCOnY176mnPguUzu8wVj03b2RsSgW3N28sd4l1KHZuf6NOyFXjCU5+qIJz+cBesgvLYVFrZYOJZzg2gNo3giuWsn66rBrtvpNXbGPxRk1M2pMZh+Nuge1N9+7cZiIPQm0W79jrhNN3Sz5akQIGs7LsQgYc9TMRt+ZkUya6c5/HRLH9M0oeUmOtYxCCN9ZUDROfjtInLcaEBIshVl7DTrdvWCukk4WRs4o9161DcWQqn8fU61cYBc+tvsHraxLNqP24NLEgTsGz1xgaNjZl3ghcD5QIk3J1TgBD1xCJ+6CN8kn2rP0VPG8glOzzzZiCwppw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0378.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.20; Sun, 6 Aug 2023 10:12:18 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Sun, 6 Aug 2023 10:12:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Aug 2023 12:13:18 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [PSqJHwpQHfFtk5UW9SGff90HtVPXUFEh3XyfeUnFRhs=] X-ClientProxiedBy: ZR2P278CA0013.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230806101323.2828419-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0378:EE_ X-MS-Office365-Filtering-Correlation-Id: 5b6168ee-7d17-428e-25da-08db96659d71 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmre2cOvxteVHTfiuSrHMX7onZVLmrVyzQbpkSK55AKyMMBd05CJjt61FxM/Xme7e/zp+l2XBIIdRzmKXtu3Ce72hXJan40V7BFik9cVOtHwsb3ArKgqWHB5UAMgiW97T+7HA7d8yX6iQzVHjGdY2lNPSzT+O6q6Gr4bw5ahjKOK9ARuGt9LiTWw350MMh1XKJVSRcH4ohRVdf5qlw9DhIN++vfvEaC5ebKCsNuKiWT2ZpqUHdRTgxaD17W/QWfbpGT99u0llFWK5CWVEJmLmeqso8IK1l6uUhPL/PuzHHtA4IR38ivtS6Um1o3UD/bUK6Qaa1XkL4CjZO+OLPD9//OZREFUo1CbpPcUtTlcG/Gxav7NMmUoKofiZniXX3OHP+rBkkj7K4eu2bE1U6fYYzC7m78x8dUCyZ2b+96CdyrzSgxq1r+8fWGLt9SZzl48bafLF0r3WGru1rxHQVoLvzcGPIISg+b4aByOJHNkgbKdoaa8yycJglOuNnUusBm08mzMSD0K8WIFdApwRk1djH4wJP3XoorCG7a4vYsfVkr4gDWgJ2k3PrgpS6gL2B/aH+nWNPgfMmOFlIgotUX7qCaFN4mwY+bPuDg1OTIl0Hu8LXsAl4sbko8xhCnZMLPxtzg1qOLmHVzG5C+zDly0+QZ/gHSLAXOwL2PZAXIFB0C/0b0uQ1GDMXPjya1M12+LSZIbRhMIZpWQLi4Hnoj+lyIKAs7mz02kAq5b6rjbWZ3S0gfqIz4qWaDUgCiPvr1XDvY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l53NF8Zq8UfMieXPBJZ6aOWC2GATx7f9sps2zOb1IloqbO2pHs41ELZrM1cZ/b4OOO9u9BQcmy+698JBGdo6Hl/ouU/RhxdasfZRmxAL0n8hBC5A0XXmRoPebQxCm1aaLrnT2+0rlMJgtpj/FF9p/gLTCY3e9MrjU/7MFlDCcZ585duZmRYDq2YENY9mWjHN+Iz4uA9DQy2n7xD1IW3rID0jmFXv6zkCumj6aaZOV1WZBe3ZlUHSdsbaZ/xwq+J4omvKS1fqOND6JOEbB8QTBpaN2Rc52wqxHXoK2TlwBsJCdVgKsz8MIr1Zba/V5i2Ix4wHsEsPs4XmEKqNLR+dvCIEvhVDTu6ckL1opYWFrBg4VcsFzoZ98vNU24EC4bCU9LkkRqTzrSYybt8OG6I/sFUUtfEpYOS2fIsW2Hs7rj0b9UVERFJJ/M3u81x85aAa8VnykxQNu6texe7YZyqZnNqhN9nDOeGu/wpuF4PyrbZcHKiXCiraJsQe4gHrKhKH3Hz+fIzFVfonMWR8h1G6IKbGN1qDV4Lxrids7XdrtnYuIYgw1s1ZOPxQ4/jGyK94gTzDeWBcK1IS/tGKc79Kt1ehh9B5Ff/evXK68gwEaZiL3A7n3AxoJQkSqgHKhbPe X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lYp4ughTAEmHZmMv+ALlmKZSnbazx9TQjQ1mZqE4uSWkHxxXKGRb+UPi3RGeR7LCK72GCEw39ytj9vSWV+Tc88/3umpXvk8+STmr6pHUJrfVFoHaeWl69WxwgK379/Io5BzRp4sPSIcW4xN1bGL7vfflUif0renEAx/3sqBjuu18zbkcFPCM17RFK7hNJbaPmQkaX9T5xsAdm3dAz6QlqIxLLtyPVOClPu7j4KbQeqTXHrf4gWxLF5FC+CwP6eipEOJsoUuH/fxHlnjfj7xh/aXoK9iZjXIcPYyilincEwINtgeFLQZ6YhfwkSS+Clo+4dFx0iiuC/VINzLlYKMZvcbpVaptn+SYbzCUaWICDnWty1hkTCDvvjRctL+JiHPcjTvT8REkY81ohGPq0K7joHoADsLaa19YtGADkBSIDZ2V8YazuGUF3bqowATJGFmXRzGwtmENtoFlOcL2UFjNsWkIlkz7jr8PcmJQo0h8LUMzW3UOXlqXYGpXO/ce/or6l7cLBRx6KOOGOypFTwuva8/1pR5FLAxSJY33EOziqcelTRY4mQGgX/jEFF/bmkI5zEOQe5SZBHY+NE4YwtMAHWWorr/E5Br1r12Lr80EGG/QDkmv2K9un9z+aLzbQ7/Qeufq4d3A7DESaYwBlBcDKSbP9wwMik4ef7ZGenywBhfnMMLPQVk+XiWKCjcCD52RKvvwO5Wk0chv93yZl2ixCib01BHgNtLAvwQBrPJpdFgIC1DbsvY9gkd6ELXz+t5GYdPo9ptwAchyFwYhqJB/aETuNzdgC0cbHx6g2cSxFhzQgFiN5dZVYryVfLoF7n+W17u4qwFB361fQR3m9J+jYK4peZmSE8ClBowzeu7T2wWWQE4wwfTmXSseSPEfnNOOObYJSshslWIsPNvEPFfLHDwEvN13VSLfulaeR8EgdzSpILJK3EV51EOH43oh9PaKYNDmxxZccjtbyjw8bKE/2uJSSawb6QSmBCWII2LtlUV4oM1tpwPwTn6+o+QGWYGbX9m2ovdlJAUifQyvxPTCcHZtBtjJQlohMSAs2dC/k99ta/MB+3Gvq97/S+kp41KKfyH85PcXYDYvx42LNUCrIDtA3gfu/qKsSdJTo9YrAoYhlZcv0RGiTjaV1nh1o4sowiIbPkPz5WVkmBbx9eJ7WKx305ywRFISa2cLxE7GAx+IKdT6huaJR1Rynnhp5rGvQmptnjR77qjbTkXZuku/13pfq9fy0bs+K6+3Ux5U7UW6qk4sv9pUwDXfnCumcBhL X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b6168ee-7d17-428e-25da-08db96659d71 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2023 10:12:18.2543 (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: AS8P250MB0378 Subject: [FFmpeg-devel] [PATCH 2/7] avutil/bprint: Allow size == 0 in av_bprint_init_for_buffer() 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: 69qx42XInAl4 The AVBPrint API guarantees that the string buffer is always zero-terminated; in order to honour this guarantee, there obviously must be a string buffer at all and it must have a size >= 1. Therefore av_bprint_init_for_buffer() treats passing a NULL buffer or size == 0 as invalid data that leads to undefined behaviour, namely NPD in case NULL is provided or a write to a buffer of size 0 in case size == 0. But it would be easy to support this, namely by using the internal buffer with AV_BPRINT_SIZE_COUNT_ONLY in case size == 0. There is a reason to allow this: Several functions like av_channel_(description|name) are actually wrappers around corresponding AVBPrint functions. They accept user provided buffers and are supposed to return the required size of the buffer, which would allow the user to call it once to get the required buffer size and call it once more after having allocated the buffer. If av_bprint_init_for_buffer() treats size == 0 as invalid, all these users would need to check for this themselves and basically add the same codeblock that this patch adds to av_bprint_init_for_buffer(). This change is in line with e.g. snprintf() which also allows the pointer to be NULL in case size is zero. This fixes Coverity issues #1503074, #1503076 and #1503082; all of these issues are about providing NULL to the channel-layout functions that are wrappers around AVBPrint versions. Signed-off-by: Andreas Rheinhardt --- Missing lavu minor version bump. libavutil/bprint.c | 5 +++++ libavutil/bprint.h | 3 +++ 2 files changed, 8 insertions(+) diff --git a/libavutil/bprint.c b/libavutil/bprint.c index 23998a8b02..4e9571715c 100644 --- a/libavutil/bprint.c +++ b/libavutil/bprint.c @@ -84,6 +84,11 @@ void av_bprint_init(AVBPrint *buf, unsigned size_init, unsigned size_max) void av_bprint_init_for_buffer(AVBPrint *buf, char *buffer, unsigned size) { + if (size == 0) { + av_bprint_init(buf, 0, AV_BPRINT_SIZE_COUNT_ONLY); + return; + } + buf->str = buffer; buf->len = 0; buf->size = size; diff --git a/libavutil/bprint.h b/libavutil/bprint.h index f27d30f723..8559745478 100644 --- a/libavutil/bprint.h +++ b/libavutil/bprint.h @@ -144,6 +144,9 @@ void av_bprint_init(AVBPrint *buf, unsigned size_init, unsigned size_max); * Init a print buffer using a pre-existing buffer. * * The buffer will not be reallocated. + * In case size equals zero, the AVBPrint will be initialized to use + * the internal buffer as if using AV_BPRINT_SIZE_COUNT_ONLY with + * av_bprint_init(). * * @param buf buffer structure to init * @param buffer byte buffer to use for the string data From patchwork Sun Aug 6 10:13:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43136 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp991875pzh; Sun, 6 Aug 2023 03:12:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFlbeIEApd6sZZbQPxJ9up1VoGm6z02OURcGrJtaa1jNMWSiT8+GsL876hnkrj7ghjVMlWn X-Received: by 2002:a17:907:2c42:b0:98e:2b01:ab97 with SMTP id hf2-20020a1709072c4200b0098e2b01ab97mr4939407ejc.68.1691316763398; Sun, 06 Aug 2023 03:12:43 -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 gl9-20020a170906e0c900b00992e23f0e6asi3422940ejb.822.2023.08.06.03.12.43; Sun, 06 Aug 2023 03:12:43 -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=Q01NMLFb; 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 86A1B68C6D1; Sun, 6 Aug 2023 13:12:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03olkn2081.outbound.protection.outlook.com [40.92.57.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9A1A68C68D for ; Sun, 6 Aug 2023 13:12:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ESV+OX9P7CLyZ9GMHhWRiNVzcFDi6LPl2cqzqZ94QelM/RWTMi7XHM5J4EINbkg6HLHbg4hoYiaGICoJ7fva+9qeNdPxD6Vg29nDUwkk50LzBnMYQgZHliYrqyYumeeX5YQ2NFNqX8zx3g5RRr4GyctBL1bubHTknHSx2FEoDAm/9p4f5LQkjx9k2GWibykD6ZOnrlVSUtG5LW3n1cKDEyy4WNN8iW8DyXQd2IgU1GPR2rs1EPPQ9GE3YD/aNR2x+Mup8LN7GdXds7aE9uUVcGiHzo/+rc/iXQEt2/LXPj8TLokok4r31v8HcS/5tuMdMDwG+ofblV5POVsOthREUg== 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=Zfl/8iEOAGM40/4Lkbk6tol1SjEsR9qAtpYSAsTl/Tw=; b=FifOEOY2/NlqSDfdtaFxA+fkJiYcGc4pKle5JoGHH/MWTQF77XDyLC0qpNWwvK1w73AnvPTDTGPAskQN8WLHhjFXlPA6iELClRkmOfndeP38nZj699HS1FsyIRtqshuAcmBhFziIlT+8xvh/vmykmUHk2GFZVyWVjAwYTXjuivjYKtPrI4hwGZ/A23DtenLbHX69GlWiXHUYc/oSwRfBvtLu+val/nO7bnRgFFVleDIsxag3yxtOdRqz/6QmJOIuO4YSHh/eXXaRO6fwRN0pKxoEmnFolnsHU+ZOAesO1tyMUuJhgGnnOR9QbW2rv5n265/vZiq9KnXTFZEnXl7qjQ== 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=Zfl/8iEOAGM40/4Lkbk6tol1SjEsR9qAtpYSAsTl/Tw=; b=Q01NMLFbNm+6yZQ5IcBiCeZiYcNf/Fgt9hZdmpsIyY8VZJjz2fbRsnGcTVM1hDzq8kvQvdk3+qc8lcjuc+cxBncLxJ26I094uYaUcoHgNhmOcMxN3hBqgsiLdfX9sPhZvFn07GmJMQ0Q/BFoGq62c8U9dvdptu1ILi0g7Xfjnf6D3Hs7CA3eyhdTCPRyWRfCr4YePSTCZSsgv9S3Oi1AC501dK5lzhw6gBxK4YjZ6uh28pTBk/ZD+zNz5wBUmn8Sxe/qjl8tDaB+jA/DCL6w5myRwHJPSw/N7VXhZHUtOXhpr5NAzdyJoV2Fmj5RbWF/UdFtsCVn9pHOmCD7gW2lCA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0341.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:328::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.25; Sun, 6 Aug 2023 10:12:37 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Sun, 6 Aug 2023 10:12:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Aug 2023 12:13:19 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [M59GiwEr5ccpS8lHj+35MbLSP/apDk2HUJCtfNtlN2A=] X-ClientProxiedBy: ZR2P278CA0013.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230806101323.2828419-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0341:EE_ X-MS-Office365-Filtering-Correlation-Id: 944b23c2-f88b-40e8-184a-08db9665a8b3 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKztMW0vhCn3pV7dFFD0NyTcErBYJVYf+zM3UGmX4cfL39qBYURv76u+ZlGWMsRnKJGMPie/JOojbl7VKweY6rDaoYt15XkI6oda0YCsFxEKg2E6/NSC04dld5eovjH+JmBCtrZsBhlIz78wqXrRndtuCeOrkDrZw+/7yH4PvhYYB3SaDIpKVZqW0gjGG+CwcaoIxxJvF723gu/geZacSl/7QIWy1DjtZkQcQKtl/gdSbKHM5qEPb9JFrBLHDZBvBv5cIykpzt/ZjOTmxBP19x4zPboWbGjITrqpoLibQV/pazINVIlS6EZmlcK/VQHOzu2M87u2jUA9lPFEeM+hrYryd1ABhuzg6dsA5b3SnFsW7/PkwDfPwvszFvfSr73QhZ2vj1iWmNXhG70smXE28Us3u0h0D3HqP5f8NIfh2zYKXUx7efAIrAYTtCUiBOuJ6EnZtJqYMNt2gpcum0sjsjmhcF9tGtZIx8cF7zaAinMMpRRyMaf6Op1xEczFGROXMN37k+5KTLRELBRVIojXRnlJKwh0O+txcN0Zm7IgvqnZ8a0dGvDHJgv6qJ3U94kxVhpPVRt/INn//25gCbofafZKl748/qj7ex+otac5M9MyNO0wHXpiPvtDFMfM2ofgTOK1PnpLPiPEHNojs+LD+K+VytHw5tz029iyTZvGQzYHP6GwmZxnz4DDPIbylJqBZt+T2HDKaDXJGgBYS02tnrYOWJOEwlrCMng= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: opbfRSqnpup3GhRJclharw38SjlG0KPnVmCCFTf0ZEQW15pec5ONDmgVBUj1helnmRx269ZCjDgcNd6afjMxSWjaygRfvCy2nA5ghgspELaG2yIR74l5hVOqfnTcqMNSXtlifTtOrUkblftnXztkd7o6m6WGzPbfkSssJTq4KP1iHfog6KfKbl3mKC2YoMl3E4bN58MNdU4Wfdbnf9TAmcReh1+KU+AxfXMLQBLAPE9tjmpDByNEeJgoqq8RzAsVB1DbpXf/IZC1BYM0o7eq1GZdsjVR9sZ2soBfHPx9nWXe+WvuqFkIBFAHCnbYZd7HjgMehqiyga01Fv8OHzasDEYY4kasqR9nGbUw/6itWh2LR0nHLRO7bb/HxbtFdCMcReP7AGyf31mJtWnq/mxC2ixPnQwvNVTFKHl8XCAzrRy/+sB4qBnzNE+IvtvOsRQkbuJplvlNFm0/1O8uV6O3IynpOBo57p3DZydIW/G4YOMhOGiqIlb6rtGTh/I/sMX7CYyyF5ifhAxNcF4bPGlIokgkkHq0OuJMW5oaHyE1ArZlJi4CbrRA8M5HgNIMlBiBpYDIsm/sD8xvZ4eeEFmshTF59kY0ZDvo/6eAuHYAolQIHKt3V6REDDkwC3VlTXTX X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Zx5Br4vwOly5x8iZGqVZ3RzDL7Lzbix0ds9OQhfDV7qbSsEKGuvxQAmRLLb6gTJpY7Kp/ZAK9yrkcVNShMEpjsy8eAkpqYBAeGyq0Pg/h46qNl60cNvCpsKzPGZ2dEOUoYkU0uYiG6OMBleCzSckqPDMR7sxqkMjSkUTybYkocuc3Kju28abKEI9L752NaBv+f2Qup8n9q15HJK1Djm2CUDWQ6ZEC8iHnpfY2ZqGs5/rSV4bcfkp5mOhFCzO+sTJG6TkCYI3di6XDwr+paDDH6ZfkEIaSz5KAf/31x5V5drqE9iJUIeEa0ChC7BVRs9m24rOeryQKY+HPNEIiVepHenNnAQ2iINETSwVg4eQFXg7ftkFqymvJUgCHp4asL9V4mpUVgkR9e1nCM+lWbh2mZ+aRZPBhUt6FH+3HNkwqr4mvg3qlKJ9iyB/pambpc57VSt415BTxNql/Hu7JYgE/FdKaH6ve5Xc3q/uTGnYa4HpKy9tnL8YnE/N5Qq5gdeny8Zwcoo12aB1gP6hTNLlOITOmO74s3mHtRkMi3sIYp+0qpH4fp4jtvCBc4JI3Po23p6iQWiSXxFO4MSglsGG/sfZbKsiM2dVwLVULtGbaS9s5TbzgGXfeteTkFkpETC5tS8JpZLCF0grJfhxIhIa6ne2XQJ8qpjD9pexEL5MoHtU+4+2vVkLE+FYE9vFoYvKw+yfV5RKtJjEy0f/iZg9YctuPram4BNwUcSg/fd4Gxr4smsv35y2EuNLBxjpfafaGfFgMOxd5SLYbcC0lxDbpRSSln6e6Q9EafQkcIRr8oZmbrtlovMwT6DrJ1jTBM3zCv9+3dLTNsUbSuh5jFPo7gHZ0S2lDGFNJxoOAS4PGNwTXF5upXwJnZdTZG0Bk2AUwbfVLZpWLbnllZGRC/DbxS6MqWy1XpIZGtOvbDDl46fgjScg0jjrULvZiueeu6sdG3Jy+XB9HISQopbdmNublZWCmbsRaamBWN9I7n5pzkjZYq/XAuqWNJPakhZrXfpBdZfjBNq3bCk3t828HgT64jHCtIrCciSb7uUxkit9DgKzNncztSVc2ZmK58QBOwDzVJNV9YXBl334MKbsZSMf8enURfc9XLm+dOmrkxHg4QBXQZ7u6x0I7UWl5fBjryfDcGQ+GQvpwzZmg9RZEPaTEt7k1jDbjqGW0Wu0FgYpV+GYNB+3NIRhqsIL2pqPgP4Qwv0eqlleSyrG0cOuwgCz7NBdjEHDtg4haspzk0AbYdLONGqCHQmOz0jjyHLJvaSQ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 944b23c2-f88b-40e8-184a-08db9665a8b3 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2023 10:12:37.1929 (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: AM8P250MB0341 Subject: [FFmpeg-devel] [PATCH 3/7] avutil/channel_layout: Account for \0 in sizes 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: OGkFYQFaPsYh av_channel_name(), av_channel_description() and av_channel_layout_describe() are supposed to return the size of the needed buffer to allow the user to check for truncation; the documentation ("If the returned value is bigger than buf_size, then the string was truncated.") confirms that size does not mean strlen. Yet the AVBPrint API, i.e. AVBPrint.len, does not account for the terminating '\0'. Therefore the returned length is off by one. Furthermore, also check for whether the returned value actually fits in an int (which is the return value of these functions). Signed-off-by: Andreas Rheinhardt --- Missing lavu micro version bump. libavutil/channel_layout.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index e2f7512254..9b581ae6b3 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -108,7 +108,9 @@ int av_channel_name(char *buf, size_t buf_size, enum AVChannel channel_id) av_bprint_init_for_buffer(&bp, buf, buf_size); av_channel_name_bprint(&bp, channel_id); - return bp.len; + if (bp.len >= INT_MAX) + return AVERROR(ERANGE); + return bp.len + 1; } void av_channel_description_bprint(AVBPrint *bp, enum AVChannel channel_id) @@ -135,7 +137,9 @@ int av_channel_description(char *buf, size_t buf_size, enum AVChannel channel_id av_bprint_init_for_buffer(&bp, buf, buf_size); av_channel_description_bprint(&bp, channel_id); - return bp.len; + if (bp.len >= INT_MAX) + return AVERROR(ERANGE); + return bp.len + 1; } enum AVChannel av_channel_from_string(const char *str) @@ -789,7 +793,9 @@ int av_channel_layout_describe(const AVChannelLayout *channel_layout, if (ret < 0) return ret; - return bp.len; + if (bp.len >= INT_MAX) + return AVERROR(ERANGE); + return bp.len + 1; } enum AVChannel From patchwork Sun Aug 6 10:13:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43137 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp991943pzh; Sun, 6 Aug 2023 03:12:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFcp0p7k+sow6EYT3oVbawbrJteWpRmrCyyhKgd+8g9r9mQHf7pdfOYnofK5TTC+bQLr15Y X-Received: by 2002:a17:906:1c7:b0:97e:aace:b6bc with SMTP id 7-20020a17090601c700b0097eaaceb6bcmr6933503ejj.53.1691316772591; Sun, 06 Aug 2023 03:12:52 -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 k15-20020a1709065fcf00b0099cb60f1905si2317012ejv.263.2023.08.06.03.12.52; Sun, 06 Aug 2023 03:12:52 -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=Y3d3+dsP; 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 81C5968C6E0; Sun, 6 Aug 2023 13:12:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2043.outbound.protection.outlook.com [40.92.59.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 604A968C69A for ; Sun, 6 Aug 2023 13:12:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rn2iYWfJWsGGzVztBiSBuFInsMo5F3lAnguSmX+Kg+tc/YNMgTXlYZazoxlbsuNdtU0WzAEz+X8TE6PRS0ugOELyd2162v+gPB70SHV8/4q2BeEwi6n+X+GGFOAP707c3BBNvGTjaqZmRGfBAh5lmF/JffKXRr+zJLKJOlsuYgkGi1SOJStZDAW3b7fmmsNmHeBUmceRdpxBtz8cvbEqfgF8mzWZ44k7Ybys6nQPNBw1kz6Ff9CueLuMnHYSUBVjtQwFRCbzencOvGjUnVbWu1xXIi3D9gXbdORcGUVZiOZHWNX4Due+WgThSs40NVuh/PhEtZBVxLnBADldG2a4oQ== 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=XM7cxWzeFnlU+WmB785B5P/gu2I6E0TkiiyWVdoXSGg=; b=NheG7eMwPRV3+grXd4Nfb8wdJ15SADtlKVHCx6Ai59GYLnR1A2nDfeAy7xl856LWnBybGpD8I9sBTGmtVBDsUo0AcSNo6ox5M1bPPunngprnl17NrKG6+z/vcbMQmyl7yYLhneukl8IylyUWjuQMA+0fsedD+clswRayAQTV8Qu+mjCy+r2eZhWRnFCDXgRTDD8lF31hcbA95vbm/nzPvUyH7sZyzVsCIOn5YgmSYdxOHq8q+vVBFMipV+kqq8odk1ZNS5V9KQg4crSbZdwCE+gOpzFB1KjAmuEF683AFtPbYBDjiJM+QcieL+AAVffjJ2dhpC53NmluxSYBL6ojWQ== 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=XM7cxWzeFnlU+WmB785B5P/gu2I6E0TkiiyWVdoXSGg=; b=Y3d3+dsPsKLtoUS7c/fGPB/mxVvHS34bVMhMJlo7CMtk2awBgtuwHafZgIyJaTrSWuBVV/ur9Wach2uYxaCzawA2a0jKL7ZrpPmSXQovYmO+Uu34/GS+LU60fU58SN1i7mUhql1DSY8OkWBB8zrMeLDeizM6jxK9aSExNlLKwJurWecTI/+XFxU0gfFU5pBuUOH6VjZuEBvRUUzhBwt5RCNjY1gMDcZpDAy2DzH1mFBxJ32oU2WvP1VIvCbiGczCq12jrCseoPVE4b4mFheusbs/WUt10pgEFpSfGC1YlAyF7hn4Bci+1f8nEpNQ3scXfjJNiQ3LVDpkW+a3C+G7Pg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0222.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:277::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.25; Sun, 6 Aug 2023 10:12:38 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Sun, 6 Aug 2023 10:12:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Aug 2023 12:13:20 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [/HLtn5rCigdHJk0kvObFHEQ+9wZY+qYocKPZxWTENLs=] X-ClientProxiedBy: ZR2P278CA0013.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230806101323.2828419-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0222:EE_ X-MS-Office365-Filtering-Correlation-Id: db4793ec-24d5-4249-051e-08db9665a96d X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmre2cOvxteVHTfiuSrHMX7oNypDEKwzdlrJFagnwC4rceWgT8Xb2Cu/PqdDkV4M/K4HHxJgpF4QgqaOIwhgqCyqgeL/eTTcUdqjd8S/LpgvzqcJ0sSqPP5ZeZe6kvNfJsLZYXySRS2LiHiJo/3b6INfBZT8Cn3rXFDS7z1sqTpvQrssdDIdQ+FS6JKi3B9nihCko7Om7PcS3y5olV4JIhn4RlTW5KgKow30xIbr7EcrrlVnG1ndDKALPJi5a07gxwH0SC7LujJLL3C957FVN36iL/EVGAR5KYu7AdLI5fax78SKpoUU806G7geBo+RUu4lp4nO5VthMXLUVYDlY6gWhB/FcdstmWUFw9zYQ53URLXx+TlXWd3e0hyYETh7wifnjudmiaM9NjB/LPVNntOsscZ2Z/gFUz09xi6e1a6TuS+DE/HEFEnx+IlirhG2G+A3N2UdiBKid6wsTLl+/iYMau5dhhgWPlonp6BA+9cndFG0DhugeFduOS3VA7s2KZ7zntYzmgH8a/pHxhnOmsWKnXguRIphiCiInMNct5O6o7NrqryEKRlcjtbgQhHnxldMDo0bq4IhZYOM2p99reoldGUFGika7znQzTiQFPBuHabbjLDuM2r2SmMsQvrKXXsituOYkKKY07yNaJ8HFt7wvuLDMcUeoUNavBOuE+weEJkTzAYReZJrTF4LNQ0zIFsX9F5GOa90r8N8KEsWPiPWjrV8IR+dG9DI/SwpPXCIm0m02rvG0HpNKo8u/9UT0XaM= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GY2JqW5FgXxdItOtDw6+GgspX61VaLK/19OfKFy/EEeLvy9wBF0YAJuDOE6O7bc6Kfpom7f9NNTgPqbFUhcZodjQXWe49+oGsb+WhBtkJV+VTlqJz8SUC8ljcgE+h7yvZtAitfFbdjd34jG58pAGQCvVKDAFaE6RvgOhZPz0Y6ICKqgcG2nIkk/zT1rYaLXHpeCvnb2ea81XM287J4f5fZsAIpIdZVu3sCBGGT/2Cyu8c/cvV64j8HY4xit7nOGZsArOTKytAiDm2KwHNGEQq1s7vnVrrHpervV/ObjHw98eya7SjWRsa2te4NB8rLF1SjkmhGx/XJUH3v0KGP5yRhZK1VqijTum6WUydUWcTFdILaaQB7qIrHYjGGnxejSPJH1niRzTNhG0GU1Mo2WPcGY+WEScr7h6fY0jRBy5anHj0wW9QXYZcdg1iWsX+copC5t8IlBPNRr4YybWdmznu5KqB14+TsNt6sPQu4hypZEMVEYU9VtRllZwWGJ57VJzW7HacXZHZyBIvwWaNCOlIGDRN0c3WLlh2SUi6fn12taqj3+D636p5IAazjNTMxLojjPAFMtlaP9xW4lnuKKevpcNBjix8a0lwkYBHqIQB1Q= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0IvEAsZ5CL/SkEe1+f8QEJyjBWouZ7dYbUGKMHJ70pfrsEk1AG5qLDerSbpiuZWP4c/hGiW2H5iu9ZUEwRxn0fJq+xfbzaVWtCVHd73PC44caAugSJ2RXnMvLhP5iapBNLDf8jLOEJb5oyyts/g3LI65NvAbgWxEmomaqNsSg4Umi+S8GEoEWRZwtmvg+eFLv230ijUSSTgHKfn4X/8xQ7R/UTKaIR+ZVnzkNKT1TRNnXN3I/zJzQNOvSiePdfi6S1O34w0XqITfNqN0n5ozJzlXNOr2AxgDuI2+/ohutN+YWX0ycnUCQgsJOpt5oK3JYY7EVdjP66GuXeqJ388eXLR3PXWIXwJtcI6gLf1drh0cDKlyPKiJVWAD+WMZNnyF5PFZJgd1I/OZYUGETTTM57fs4A39NPxnYT8vqNmeS3jXSjluDo0UhrunjHUX3Kxh5OgW0yWgGqOKAqDOdS/edDKCQGySgM4bdXIwcL0TsduXhmMA4h6hxAjGzN+QoaHVhDyBQnUPykdvOKWtU5zeIn8yfkJjgu5DjxkewSuIvrnWUxqf8QX8lTdAe3HNUsJSkyZqC3mSoYt5IgwDYQ3/hDQ724nDUwjA//tzz1zy2Uiev+QfCNkHZR4tMm1lQb+tkz6bE2I0h/v0y/K+eZFAU56V+086wr2OY9lOpMCOZrZgdfckaLuHYioHH9V0tuiQVc6+YvyjhzjHTQ5UJlkP9LECEdM+FRIBNABgarBSmiM1RG29F6G4ZaMYE362Vqnn+LGsee6RPq21p+bCb+ifbKDO/OSUPy61UM7pcDlezEcVZ2bFHi8c24YC1e+E57ZP+jXSewNbmSq3WP3fReTpcJHL12Glv94izQNDKiu+PC94InSoTm5NHrj0u/YTxIS72RdXw0vmdOYYrX9Shl1XgYo3JAftPN8EsCSd2nOCBw9zOENVIz8QK5b7m902oh+UGAXTnYDJbkKVMIFuK0xLJK60E+j0L+nWio/a2r1BdIp12ikdurdF5rD4UT5KEutR2Xf/1kcVu6vK66tO5ev243QxEe7Zk6YFqcM9rXuYgVlBAh3BZcwIGqNtPIAejfel6vH/iIvE3fKfHP7446dgu+oWlJRsSsoCkurz1eAOGI1pNQhIm5aPakPdGu30ysQHJliNc0d6YdvYSgA+tyqCoebVP43pWG98Lb1XvNyEx/Ky2d5CHEsgX6xeGFiTrTUNc3WYApfH8e0ifntnAmat+qeFV+maGj4MXx+LGg2AxOdFYP0O42B5KukEnZIsWE+x X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: db4793ec-24d5-4249-051e-08db9665a96d X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2023 10:12:38.3544 (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: DU2P250MB0222 Subject: [FFmpeg-devel] [PATCH 4/7] avutil/tests/channel_layout: Also test non-AVBPrint variants 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: Z4g1cVN4Vlko Signed-off-by: Andreas Rheinhardt --- libavutil/tests/channel_layout.c | 108 +++++++++++++++++++++++++------ 1 file changed, 90 insertions(+), 18 deletions(-) diff --git a/libavutil/tests/channel_layout.c b/libavutil/tests/channel_layout.c index 5516db0904..665ae6e277 100644 --- a/libavutil/tests/channel_layout.c +++ b/libavutil/tests/channel_layout.c @@ -19,32 +19,104 @@ */ #include "libavutil/channel_layout.c" +#include "libavutil/mem.h" + +#define BPRINT_ARGS1(bp, ...) (bp), __VA_ARGS__ +#define BPRINT_ARGS0(bp, ...) __VA_ARGS__, (bp) +#define ORD_ARGS1(str, size, ...) (str), (size), __VA_ARGS__ +#define ORD_ARGS0(str, size, ...) __VA_ARGS__, (str), (size) + +// This macro presumes the AVBPrint to have been cleared before usage. +#define CMP_BPRINT_AND_NONBPRINT(bp, func_name, ARG_ORDER, ...) do { \ + char *str; \ + int size; \ + func_name ## _bprint(BPRINT_ARGS ## ARG_ORDER((bp), __VA_ARGS__)); \ + if (strlen((bp)->str) != (bp)->len) { \ + printf("strlen of AVBPrint-string returned by "#func_name"_bprint" \ + " differs from AVBPrint.len: %"SIZE_SPECIFIER" vs. %u\n", \ + strlen((bp)->str), (bp)->len); \ + break; \ + } \ + size = func_name(ORD_ARGS ## ARG_ORDER(NULL, 0, __VA_ARGS__)); \ + if (size <= 0) { \ + printf(#func_name " returned %d\n", size); \ + break; \ + } \ + if ((bp)->len != size - 1) { \ + printf("Return value %d of " #func_name " inconsistent with length"\ + " %u obtained from corresponding bprint version\n", \ + size, (bp)->len); \ + break; \ + } \ + str = av_malloc(size); \ + if (!str) { \ + printf("string of size %d could not be allocated.\n", size); \ + break; \ + } \ + size = func_name(ORD_ARGS ## ARG_ORDER(str, size, __VA_ARGS__)); \ + if (size <= 0 || (bp)->len != size - 1) { \ + printf("Return value %d of " #func_name " inconsistent with length"\ + " %d obtained in first pass.\n", size, (bp)->len); \ + av_free(str); \ + break; \ + } \ + if (strcmp(str, (bp)->str)) { \ + printf("Ordinary and _bprint versions of "#func_name" disagree: " \ + "'%s' vs. '%s'\n", str, (bp)->str); \ + av_free(str); \ + break; \ + } \ + av_free(str); \ + } while (0) + + +static void channel_name(AVBPrint *bp, enum AVChannel channel) +{ + av_bprint_clear(bp); + CMP_BPRINT_AND_NONBPRINT(bp, av_channel_name, 1, channel); +} + +static void channel_description(AVBPrint *bp, enum AVChannel channel) +{ + av_bprint_clear(bp); + CMP_BPRINT_AND_NONBPRINT(bp, av_channel_description, 1, channel); +} + +static void channel_layout_from_mask(AVChannelLayout *layout, + AVBPrint *bp, uint64_t channel_layout) +{ + av_channel_layout_uninit(layout); + av_bprint_clear(bp); + if (!av_channel_layout_from_mask(layout, channel_layout) && + av_channel_layout_check(layout)) + CMP_BPRINT_AND_NONBPRINT(bp, av_channel_layout_describe, 0, layout); + else + av_bprintf(bp, "fail"); +} + +static void channel_layout_from_string(AVChannelLayout *layout, + AVBPrint *bp, const char *channel_layout) +{ + av_channel_layout_uninit(layout); + av_bprint_clear(bp); + if (!av_channel_layout_from_string(layout, channel_layout) && + av_channel_layout_check(layout)) + CMP_BPRINT_AND_NONBPRINT(bp, av_channel_layout_describe, 0, layout); + else + av_bprintf(bp, "fail"); +} #define CHANNEL_NAME(x) \ - av_bprint_clear(&bp); \ - av_channel_name_bprint(&bp, x); + channel_name(&bp, (x)); #define CHANNEL_DESCRIPTION(x) \ - av_bprint_clear(&bp); \ - av_channel_description_bprint(&bp, x); + channel_description(&bp, (x)); #define CHANNEL_LAYOUT_FROM_MASK(x) \ - av_channel_layout_uninit(&layout); \ - av_bprint_clear(&bp); \ - if (!av_channel_layout_from_mask(&layout, x) && \ - av_channel_layout_check(&layout)) \ - av_channel_layout_describe_bprint(&layout, &bp); \ - else \ - av_bprintf(&bp, "fail"); + channel_layout_from_mask(&layout, &bp, (x)); #define CHANNEL_LAYOUT_FROM_STRING(x) \ - av_channel_layout_uninit(&layout); \ - av_bprint_clear(&bp); \ - if (!av_channel_layout_from_string(&layout, x) && \ - av_channel_layout_check(&layout)) \ - av_channel_layout_describe_bprint(&layout, &bp); \ - else \ - av_bprintf(&bp, "fail"); + channel_layout_from_string(&layout, &bp, (x)); #define CHANNEL_LAYOUT_CHANNEL_FROM_INDEX(x) \ ret = av_channel_layout_channel_from_index(&layout, x); \ From patchwork Sun Aug 6 10:13:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43138 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp991992pzh; Sun, 6 Aug 2023 03:13:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFCejf6bfD5Zl8PUyBOmZLGvTG1CZNihYaD/eEFegA/p5t9exi7s/ps+EpLj5nuFaTie437 X-Received: by 2002:aa7:d745:0:b0:523:1400:2d7c with SMTP id a5-20020aa7d745000000b0052314002d7cmr4794784eds.35.1691316781434; Sun, 06 Aug 2023 03:13:01 -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 r11-20020a056402034b00b005230f503a01si4162712edw.417.2023.08.06.03.13.01; Sun, 06 Aug 2023 03:13:01 -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=aMXh9vzg; 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 9098268C6ED; Sun, 6 Aug 2023 13:12:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2043.outbound.protection.outlook.com [40.92.59.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D44C68C6BD for ; Sun, 6 Aug 2023 13:12:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zv2sRMLC+AzcOq4sfZEoprwo265EVmfkS+ggXQjzRsu0k6wCpvWeKmCnfYx2xzwgLXaPXR9KcyCz/hm2GaYoi3lXlc9ozI938c06bZL0e/l3ROVg0Jl9or5InR2aRDobID9HRq/i5KE8NGKsnBovktD4VP7CbeUMbjUtarex8JsUK7UFwjChZRk6Lv0Lap6GwPv3GMVk63CE5x9rk5Fc+/fm7+XS7xTdCahkIyQDRvemT1Q7Ys1LqB5jSQp8lCyAkx4x7q24jjVmiNCadwGJc+LrEX4rc4RiHjkxat1tGhHIsIE0pydMZO64uA7+h2X6o3fwa6wx25Pv14xCHm/PMw== 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=0S1I1BTClzIdnC9c3kLY4qOYS1sMgBmqe2IfDh++eFg=; b=JsebIwCgZHHWkcvhNmDirCPAAMhOSLagiqwJ99qfdPgLpnNm6svNeZDhHeWAg8Le4FQvwGX0+LrBfN5HYHR9gi5usBrQZhNKb66LnmWNsq3ZGjANFHF51H1k/SGXT6oaOWfowbbVItY3wO5KkCiGTG9yjLq5thsZ+hQGlh+oPBJLWFkIVlg4rqOrLvKm9KuOOxS0TQPS/luiFNu3CyZlf4c1mp1cGgUpqwYdBcJCWmzbrkT3mC93dI8KbuX8RyIUwa/QVMUpg2ptZhxecas0CxK08E/NS0z4BSBtMoWjgdbQqsxUG9KAt9qvmR+kVeQWLdBPWrmC9RDBdBz1GjNYOg== 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=0S1I1BTClzIdnC9c3kLY4qOYS1sMgBmqe2IfDh++eFg=; b=aMXh9vzgpsHT9MJwYH7BqjU9/s+gyI2DxeTu5T2WqOgG3HD4PeyRbPlx9y/1F95uqzAumamDDNKmvFSTAUH1G3Lg29lr/3v5Ap5h6QZukCWORPLrGlyzWhGfihNQDUe5Xvva+foiFXJz+Znv0f5z49g54sO4kFHPZASvr+RDNXUygsw/zFpGEjvXbmpZqiXmuthbjFC7QyX6Lvu4VBXAqptmJs8f36HPlAQu4kH+rP9PA9e86EoZfAXsDTTQMrm/iTwdP0dhm4gYXxmwGTO0H6jfVdgsJ48b3NLsuJuyrqSH4JsrVleJGniTpMI5FNGSxKKSzwODCFOQyZzvb83lvA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0222.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:277::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.25; Sun, 6 Aug 2023 10:12:39 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Sun, 6 Aug 2023 10:12:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Aug 2023 12:13:21 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [nRSAcvzWQm9N9PmPyJgLnUQcfHAD03wrbSEP6Oayui0=] X-ClientProxiedBy: ZR2P278CA0013.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230806101323.2828419-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0222:EE_ X-MS-Office365-Filtering-Correlation-Id: 085b361b-3eea-46e0-1ee7-08db9665aa0f X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKztMW0vhCn3pV7dFFD0NyTc7YPG/5khHVJvHlIWLcSKXpYtvlg9ys/7eeYbrXWXxKXDSLSIysJ9H+ftQbVchUe3Jde4NcF084Y9R4l/X6dJnGp5MySAmlXS5GG3ykU6Y4AD9joSrm5ojvNw2hMck383hrzmqy1YgsdYy4+i/NB5DwHvytrUr7NEVcdoaVUcncGJMKIrv1hru3rI8dWPnbrtIts47jHSmxcotUXBw6nLtqf5JUlSdS54bD9iaQxtD3d/gxFvnufx/sMu9dhxpw3zYwFgs1FWTWVK3P4KKBKK6IlkvRKU7gPIWbqgf1UDMHhUIVyTn298vCV+x6bHNHvt7hV21aXsNLQhZYPic776kcuqsNzmtRS8oG2jtifyV6Typ9xH5Z7f8KJSNjDO+qyPiaVf3TcoT6Ru8nQvsxqiEfkCNVNOQ/qETfyvXBGEZB84gjbI2YaNEhzL9IpjUbwNoM8rVkHaBmwrhIj2G0/WKzyfNcEV2hJ9HtHeRE2kX4ydilISdz6iCyA8waCbi+SGy274x399exAN8Ct30B14pOijuxMXWGxXsREwcSlfFwNbbqnDUtdY7boy+7/il1PFP4TvVq/yq+hE24Sv4rMnPmJmRpHXU1+dELvlyiuPlQa8qGEbdxTcBplO1PtYfOZCmCsQFjVjkfy5DIFEPuS6reY+gbweR3Bdz61lxJwBssSMHCtU5Coj2zmHdKn7D+4V9eM1P2WUIVw= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D7hnY7rDF4up2FNOMPS27lfjKNR3wrLw7lJhTSzbOY1yNiXm674SPMe0EudQpZcNf5fKxwbagBLyOmnP1V7dQ3lY2245p8zZuFWguQpugh/IsozfxHHmCLqOapBZ6WFo2qUPiY/zCmtETDgoYVaWX6ksHcCgf4OQthw0hzf0eSXAgOWN61LGutxxNWNIu6OMvfvf8EyjCifkUW0P7FthN2zncuVg9f2YjS9B0Rul77rxQUN8KPf3MT7rOJCun74vULM34F7ysYkPDfVCcgCPkbOcjTfV69eQ8IAr0yj2XrWs1eDy/eUkW6MdKAIlisx7aGaYBywoNXDTEl1js4U1rYZNwdw7YQ3JtXPUNyouMFfHIiCHf9ZM6vz/3W8uo3+cNbbsWOOzxJ5We7mriW9af2QiGsSIA6gE4WKRH1mUZLxNUuDpToHbvFUsMgHd+7aTwbPeM3hOQ29gvoC79zfwqcYLK8JwYgi4j4wdZbwhj+COucgFdTYP+lvz448V0lrWKmj1PARvjynkPi/6SptyjDQswhBvNPJYrTF8maXCZ0C7vLUnf1wSnIb+DGF1huFfyqLCgrkoLDP7B2KeIy32fub260DNDa+9vVvwrA7FjbvRe2fwjQ4n+Hnr585xbL2e X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nijL54fl8ttdmByp15KpKf6rRzCP4g6MrPgclhhXIa5eZJl0k1TSMNsJ1exhlJEVWvxdgOTlMufPqSzCKQ+W7Pj9mfVLNwbikAePewWTOkf/h8O7Fo6FGoe1OEmqLYPTT86GU0aeMixhBKSCp/cVIdk9a/o9mFFTD3XDr4fZfoEkNMG6oX0RsTY8A6TzI4nn43RRoJdKaOzUz8irp2xNzOVuwOfYyEADCcn+TKQNBVyqIAxmp8S2Yr0VJvp6YllsOmHoaDoON9LQY5fdeMNg4t69UErH/6MSyMhaN+IGFfTPF3E8NDYztgdeEZqgVOcvJUiZM/0o3DesV3oQ7eaKMn/bW16R6A/31e6Xc6Xq0ca12s1WuJoZjQ6sB3QHrsgqhveTz2w/+dkmH3zv4md6BIA9Yu15b7Xq1zHOi/iljXx8lRVKB/4nCR2xRasMHVBBaGrpX27GOfByDuH0iHmNmifuhNxqiuIIrYYunANTQ5Dv1Tf59MYkw26kCm7d7A50M7qNkpvPt9MQDaWpDChHg16WEap8oKx1cxRZX1V0oSrHNoEGxJQ4nboaDPF+T1nnkgvoG4G0A4F+V32IFsOa9DJdFVrEkbC2mnPGeFr33sNYscLR4KmHK5yPIxASPmrz85aFqjur9ZBBV43OOZRDq3B42YJSr7EAkTQcKvRYiTfTy+Tm6mdkJp1rNTpt5B4Cl9qIV31BHISA8iYNp5oUebBmJ5mRenr2fJxzJWCOntAO0l8BkjxESZzsDahqL64eVeoSxIHb/Xa/uR6OJbPsp6lLhFAolLo23yBNc15xpTc7I+/ldln91NDS4+ZZX31d1S/KLTBO+b2vzIj95JiaRmMhZzyIBcgFvgXzbIPPxpAzj3VsAPocScsEEsrUDwSiGRoTaU63tHBVx4S61LeQQCFJEH2vG7G+3TUrd0/8c0jJHtB/TPXncn9jsqtJYkDWzlx0oQhw+RvjtBkqaxAgNBXK/dZYHEEuPgEhVzt4fezAAY86cwKHh5J9Fvp/aDMjYp9v9zXvvysaerYYDL7ZSrIa+3cNA8hmlr9pUwh3PdvU/xgZEmzTyEQB4VoCHrbhTat2i02qS1BC/IRP2z1ImK8vv4SxVgtdH4iMU9BvsCtHNlDAE2q46WP07tdS7+UVj1TZ8pDS0O4wMsRJLUsKePI2hX7ILvWmblF3EiSjf3cVkWwjlWeg+iqKitNELvffuPH9n3G7FDREuxCdlA9YUZfhGsAPet/yBB6TO4Wan5rpil3VQKxXaV6pU3FJKokB X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 085b361b-3eea-46e0-1ee7-08db9665aa0f X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2023 10:12:39.4526 (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: DU2P250MB0222 Subject: [FFmpeg-devel] [PATCH 5/7] avutil/tests/channel_layout: Don't include lavu/channel_layout.c 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: ULibRSxA4DR+ This test does not need access to the internals of said compilation unit. Signed-off-by: Andreas Rheinhardt --- libavutil/tests/channel_layout.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavutil/tests/channel_layout.c b/libavutil/tests/channel_layout.c index 665ae6e277..19f552f8bc 100644 --- a/libavutil/tests/channel_layout.c +++ b/libavutil/tests/channel_layout.c @@ -18,7 +18,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/channel_layout.c" +#include +#include +#include + +#include "libavutil/bprint.h" +#include "libavutil/channel_layout.h" +#include "libavutil/internal.h" #include "libavutil/mem.h" #define BPRINT_ARGS1(bp, ...) (bp), __VA_ARGS__ From patchwork Sun Aug 6 10:13:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43139 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp992078pzh; Sun, 6 Aug 2023 03:13:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFuO6kLRelZR9QUj8nql5ub9NQ5mgV5n8g+2zUA+5lzbVkJMglcwL7iRwn4HEdTMFbQ1K07 X-Received: by 2002:a17:907:7711:b0:99b:f3f3:e412 with SMTP id kw17-20020a170907771100b0099bf3f3e412mr5371246ejc.52.1691316790360; Sun, 06 Aug 2023 03:13:10 -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 y25-20020a1709063a9900b0099bd6ea3798si4373997ejd.136.2023.08.06.03.13.10; Sun, 06 Aug 2023 03:13:10 -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=QJ8g+58a; 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 8CA5B68C722; Sun, 6 Aug 2023 13:12:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2093.outbound.protection.outlook.com [40.92.59.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4037568C6E0 for ; Sun, 6 Aug 2023 13:12:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ONg1+jhjIPVVIkZSnbiQBXq1jd+jcreGSEn/SMvnyu+WpDkPyLsuUAgQB9NE0MrGnbyvM2EJqVeODYe4edCidA6dJ25hAdrxEz0itnYC8dJqCnnInXk7063N2ececGRytUWisxKxYPX/q1SGaIWcyUztRO19EN7XnckN19n3RJwm3vxKLmOw7Nn4+Hzn5fy9Rxjc9HuTXjrxHQodmwC2YyxU7528PgK4OEHYsbN0p93AmUgsfV6S7alG3tHaP/eZZfYBbSYLOR4wsZUXpRUj86WKgzDC7hrFNB+vYXp3PxSG+LoG0lveQ1MGI17VBS7+Ouk2AiDQOaixkAgV01gRXQ== 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=rUGRHal1gVN/lVyAQE3t9Bz6XnVFSTLMxSrkR5ZL2mQ=; b=gjBM/+NSmvDvVHE9RwjHm8WBHZ4OrTPgS6vmiqrnJifJIpCQcLexSU37Tycjh2ureyy5aYU3X63VoVMu1VzPvNIHox1EbnDcj3c4crVKVoxt1ATcusFR/VEPs0rIuvbBsJpGtog30jaL3zRlyQAu/3v+ZkHkTMaSM2jYymA1R4PAtt3/ylXJGsupwbyrhkZVZwY7kI4mF887/aSt2E3w361z+6Lk8xi97+SX9nD6yhcJFCM03KvizkimPncviKwEDx6iv6SPoJGWxMtOrw8hohai2svOUIVr0ZpItu/rn1ssR92qS6YHZQqYdoQC3tKpg5SqUZifNTO7HtuzVoXOhA== 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=rUGRHal1gVN/lVyAQE3t9Bz6XnVFSTLMxSrkR5ZL2mQ=; b=QJ8g+58aJhwhQW2A5KQhDgfnIsu84jEwwVR9Dt2KZjOuE435BimjK0hUKQjT87qwU/5xDY8dTbuLsS4i1GabRJ5C7iQl0ENEXJiw6A1yNA92jxR4zZ80BsC58ii9JHSrorH4RHsndlcnTOwNEftFIA7FuTmbheF4tXgw1wk2Tg2LYWjQyU+xMvC0LeteKxmqyXhBxlriPAcbXgmFaHeWHgTjqsP/nVAgwVqiMc6O9ZaZ91PYKOWoKQBifNe1aG0dChDPglqXOczSF8O61q7DE9z9+xB/ATQ7gaSQpBsfQ1wqT9xVAKSzeR0v6ibP7tWZ3Fo6FJbhlj2BQcDXcHNXcQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0222.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:277::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.25; Sun, 6 Aug 2023 10:12:40 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Sun, 6 Aug 2023 10:12:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Aug 2023 12:13:22 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [7zVnHrZ50RmeTlwc/3kjtC185Iw3Y7r6Vxt3tXKT9v4=] X-ClientProxiedBy: ZR2P278CA0013.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230806101323.2828419-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0222:EE_ X-MS-Office365-Filtering-Correlation-Id: c35a1d54-639a-45e6-0020-08db9665aab6 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmre2cOvxteVHTfiuSrHMX7o8KrpjJfRKByIIZcRpEYpZC3loSf1i9H6g7Fg5Q1fAUuAMk+loxxodN9HmieFGHNCdv1OsdIAp0mG/Sye3kV+qi21pY/snAfaoh/KEZGFL2r7zKliLdJCFKLsrPJL+8FTpq/dk6VB0qiiRr1B3p9MrjXlnoH4jUmqwlN665Y17cZIQu4fsHMGniTz/kQ6/vVpoWTlIWziL5eC1+kWhdxEC3ZHSWMHasRNquGxfqaX8XrtzRbuDSgLnoVMZI3Sg5oqrVhiV38eYvXtH9SjG33g5J+csOGlPKX9nMwO3qPNKzFofpNbq+8WUd83jciUZbNXBgjyO2ouKrcx35UlWux1zY4KnHZSAomCdqwfbc/C4EHcp/Wz3kkpSBqeE572JcvENbeUwMrYJ8eECxqjM+Cxtzdkm/5vJIlDXZfoTJxfVTiWPHFERVfbOjiF55bQMCz5AuIDcZuOg9JG1r9UGrH4G0XJfF2kKHP6ZMYo6CgQocKqIHAXBz7fGSADmc/lbzP77Q0F61QwvA7MeoNuscigZbGoUgA6d3kRMF2jJRS9hMQdxN1mMXfX6De85zBgMCMg98byd/snl32TCcjSQo5WjlTc+UeJgY+A23fCOw6Ub9PhmjOBLm7JwApfrfxKgdhoSYlNEc2E1t+hzsOxj4XURSUDvDwCw82eOoVOnqx+hGfWBXoUUpY8Mu+DaRcnAJe/f1YL+uuPiMu64y1f27jFHsbPhzQCLaKuIz4DqcIlLFA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5IHay13veTEQKuZTIWscJQG82AZO/73+LDTJtjMIgWNsOXk1z1zlQZIoPfaM/Fjjr7NSwfDxPQjhZSXQGSTLPMT9FSejBg7wGEe9OLlJCc7dvcizwizBZCs9whvEd6kHoIfvJtQroaRt9/4taREWg9Iobfu+Y6pVxO6Jy6IZ2ISoPM8r472tazgB4/Sd/iJCD2uZAtdXFS6KeBqrLuuGByjoUnIEkBG0ecyeMtsBjkTYEhXyhgUDY6cBlmyChocIb8/NYXIVoaVtFDO5P+ySPcuoinriTinrsId2i5RTluJeIaQBwrSll9XzNaGel+4v5NIL7TvC/P8Z6HBmjgpeoJeAdXSMPjQYhG8ozNQH7ZnDR74IOASuOLD4h8oq9IaMOb//HvhHuGVFaYpOOsSGxf1/6qK9BaaK0rUSaYO3T0OomGW6OYvK8y/OhSMJmVOs2TKM4ixqf1meycvrd9MvZ5fQLJkbOxnty0qV9RyHBQxUEVj+eWlcKkQTvI58DBN/w3UzCVwJXiJe5+IRLcv5C+yA/30ui8pWCZmefwnLOxyvLwKh94nsrOnuUT2vzpLzr+aGZENveR/uwre1iiS/IYCjHNr6vqOewoxhutiL1ls4ZFV52yWZ0pAlmeu86xkq X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QRJe7eifwFaSmohsqeAFVbm6+mbD432tENj2plELwBXJFdYVZHTZ2mtun3dWVX6PbWComVaenYiBoCnk7pxY0puWjxQyIn8ZqZVgyCEIjd59p9cYpCnXJmY4WWtprudfYy+UDE66+t+fN6Rx6qf7fgZOLn8Z3bRLBTgv4xxq448EpsOmZZWVJpcdGT38rBAyikbU14C5r9m/2cKPPxX1Po0RGf82wMgfi7QV1/8U3tlfZkHsI8nKb6FLbZZZp5WbPyGR8PjHJZfmPZkGeg3qv8DVoi/ySQPwWuCKssFGOXrSoOehFrSZau4Xt1UHdUWGCmc7zB5JoaSY/qrVLndUfCQkwei8UD2OPgzIFHQawB29BjPMx56xSDEZnw14ruRv8TlgE0iGtYL/tGmj+TZJcZbezUMIF2tUu/A8/vJxXFjJhEcFb3YuC3vlAZMyKhsKU2WilZ4l5MZpfeYS6j6mBsgw4ER6BdgWJM6fhDg2AJwRwn7znhqIGAk+LM0I0OXzn6xeDi4ZIJL+k4gGjQki1exwoP+yMkjpRb5KLaGuqKPvHqE1ztbIlmjx5nd2ajuwhaUGJ2Z81vzbyXBIWrUWGzTVhYbTcwQVIZSNytTUWVhNIyyfg7YAEKlmYVaJXUiLpEag4LyRRMKvy8wERNTc4yzgnxpW3ktTWfQMLzKG5ET17giZbX612bj8f3Zr+PKij9F6e6XwOg3gwN6g64d4Dkew8IbhnfLAb+CEf4WFhfUr93YzgFqO5lp3hoet0/8rTnc4QB3GFipetV2+ULBj5/xGc4/17sfkKIDKB+UIbs0v/TckRIY8jnTkiuB6iW8oxAd0VFaPtonU7xuaU7Pp9W9VTSse2cEaHgT7gRAszPhRhaWl16BfM1zg2jvewwn9O3f/JxR8aI5QPUOwzaiXYvFjATLPd+GqK3sybg2OdNsQ9jfmP7caCV0RUMTrZLSfpqKxVebq4vmOW2VbCEgyE+d2hkoU/KcNVgzhM6kOvB/F4Wktki8VnyOR5adPo3MwIeCUCt08GtqR4380MO8S1HwHHPXNTVAwW8ebmuPLkMMgXzq9Gy00W8waNc+jLBSIcrRK7S8Fp0DeyYhna9SunCX8b14iawL1Ea9g8UoSmaJxppLdDqY0LDMTnyqv6zizECejaGKBrweGwtR41w1wFfhbN+63GRgQ3NnuxGRe4b6lEOPG+4CwB3mbUkHpWsaGhJXbq0Maz/iwExoeyPctbJeAHO5dKOFqj31COIFFJaJZuRwY7RtfXwWJjx2r2E7h X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c35a1d54-639a-45e6-0020-08db9665aab6 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2023 10:12:40.5163 (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: DU2P250MB0222 Subject: [FFmpeg-devel] [PATCH 6/7] avutil/tests/channel_layout: Test av_channel_layout_copy() 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: /f1Ylf5bRX+W Specifically, test copying a channel layout with custom order, so that the allocation codepath of av_channel_layout_copy() is executed. Signed-off-by: Andreas Rheinhardt --- libavutil/tests/channel_layout.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libavutil/tests/channel_layout.c b/libavutil/tests/channel_layout.c index 19f552f8bc..c537e7e710 100644 --- a/libavutil/tests/channel_layout.c +++ b/libavutil/tests/channel_layout.c @@ -150,7 +150,7 @@ static void channel_layout_from_string(AVChannelLayout *layout, int main(void) { const AVChannelLayout *playout; - AVChannelLayout layout = { 0 }; + AVChannelLayout layout = { 0 }, layout2 = { 0 }; AVBPrint bp; void *iter = NULL; uint64_t mask; @@ -324,6 +324,15 @@ int main(void) CHANNEL_LAYOUT_FROM_STRING("FR+FL@Foo+USR63@Foo"); printf("With \"FR+FL@Foo+USR63@Foo\": %33s\n", bp.str); + ret = av_channel_layout_copy(&layout2, &layout); + if (ret < 0) { + printf("Copying channel layout \"FR+FL@Foo+USR63@Foo\" failed; " + "ret %d\n", ret); + } + ret = av_channel_layout_compare(&layout, &layout2); + if (ret) + printf("Channel layout and its copy compare unequal; ret: %d\n", ret); + printf("\nTesting av_channel_layout_index_from_string\n"); CHANNEL_LAYOUT_INDEX_FROM_STRING("FR"); printf("On \"FR+FL@Foo+USR63@Foo\" layout with \"FR\": %18d\n", ret); @@ -425,6 +434,7 @@ int main(void) printf("On \"ambisonic 2+stereo\" layout with AV_CH_LAYOUT_QUAD: 0x%"PRIx64"\n", mask); av_channel_layout_uninit(&layout); + av_channel_layout_uninit(&layout2); av_bprint_finalize(&bp, NULL); return 0; From patchwork Sun Aug 6 10:13:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43140 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp992140pzh; Sun, 6 Aug 2023 03:13:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH4JbOJOCq+y1452H7xEI32XAYWr/FLpVNckKKsbfuRp/pEFF7YHP+0U6/13GCj+L7poiad X-Received: by 2002:a17:907:7708:b0:982:45ca:ac06 with SMTP id kw8-20020a170907770800b0098245caac06mr5442742ejc.60.1691316799115; Sun, 06 Aug 2023 03:13:19 -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 y22-20020a170906449600b0099cb0ea654esi2611004ejo.1033.2023.08.06.03.13.18; Sun, 06 Aug 2023 03:13:19 -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=L4xlWV+U; 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 821AB68C738; Sun, 6 Aug 2023 13:12:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2087.outbound.protection.outlook.com [40.92.59.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A6FF68C6EE for ; Sun, 6 Aug 2023 13:12:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H2XBBlqRoUv8W/OlCGn4RyFrx/sedqX8Dgg5BDzOcxd2hKiNyR4qW/XVShiQtu+PlRwMr5duAaor/gZCObCbnY94ySLepfM/KfHuCSFHGj9K1YGqHYEY6cq5HHHZNL/jFg+vB22HoQrchmwY9Sip/7TZlJNfE0Uf1t+kFO+KaNdGcaV9PQLQVAunkNjduAzbmcUL0/yWq1xV3Tb4sbn1mhJkUwqR1tkVhL6cMVzULgze6Jd3hi87k6VM3YXIbJbqr64IWMxxwf+xL6EmCwSH/D1qXotntqxRLzoDg75qHE7mk+p9dvLNV4oo1dY26JR2Tbs9b0eDjeVG5AvwNOr+0g== 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=EqVJN2tEw8NNoFx6Ys2eKVB9Z6tnjy5oqCDpYjibo3c=; b=EA7+zC5406htS8sN5UEPvZIfXWK2reC0sy6cofPc1d5A6tldVcwhT8FQtFhFCzv64XeWEmS8UM9IkhCz6FW1e9b5EAZLcnTwqCJEtH9wRbLHYv5tuHtet8FTqC35hb9TYuD/mncKMcXHBzniJwqI7kUnV8UMh9FLCx586pOdWDTAEb/03CKIVNXapr0KUV6m3yyRf3sZr4KhqZK/PiiC5nv4MpJL3wXgzQ2UtQR55AalgiTE7R4Dlei3njH57Nb/H9DWH8mD2o0WXgeBEf7Z4xCZznq5/WXmr4PBe3DB37z8++92xgPR3dVbKY8WGE/UvmI4MaOeq5Egcqmg2rOqpA== 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=EqVJN2tEw8NNoFx6Ys2eKVB9Z6tnjy5oqCDpYjibo3c=; b=L4xlWV+U3oGG748sPFuiDw8yhF9Al3da0iw/iMBDfAQjlwP+wWsjKGa6T+X+t/CaoSxNd8/Z/jV+6C44g6K3Lei4UIAiToqCyEoo5eRJa/6OElNXFgfjgPKR43GXVG/4W8WJ4Qm9enYPEa9DaUojoVwdAoje+Rbvixrs0YUZuPi1oA38KnLcZTlN3kuo8Dn6tgoHCwQan2bBKU2Y2cOTUnXRluQ4Z/1K22VJfjZwjbGOJVsDZOmodXj8FuLB/SMId646T9vjiDySJOYplnuTell57bFxb8nmGq6D99RfLtBD9m64hJa5zTi3Tb2aduLxw4n6vJCI3EKk5WA5plKrSA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0222.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:277::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.25; Sun, 6 Aug 2023 10:12:41 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Sun, 6 Aug 2023 10:12:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Aug 2023 12:13:23 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [pCQeeoz1zRxWb7P9seoMqBW4/fuG0rh4rjKC7PXLEWU=] X-ClientProxiedBy: ZR2P278CA0013.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230806101323.2828419-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0222:EE_ X-MS-Office365-Filtering-Correlation-Id: a7c49b33-21b7-4d5d-d932-08db9665ab5c X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmre2cOvxteVHTfiuSrHMX7og6ohwkZr6C2opTegauTJyOPXN+yV58s4CvwGOrFzf8CNvYObscS8TTJpHNawypwHB+1XLWrf+pFjJV6lS7Kp0Hqc8Jvj79ODiDBbh9GWzfTITUvar0cNsEOjBySpc1Y2AMaRKpKnTOob5JADiIT1kDlcu0vn2gcrUAXlsUF3xNaLrjw1qVdQk2InT6pqYzmz+VH+bL5JBb7HHa46ln89FVJk3NvIXIIyotwM/XBS+MIZizd1PZMpGa1cqezX574zpCt23jU4SROG2d09GJXZq3r9W5lIFEVv0iqQpnBZG4k0brX7UOCr2N1d0ApVoTNqPzAe/MKNxzklvOyWWIBvnTNzrFqjz4qNt6zb0y20XfJMA3AW8tIcwdeEHX62N3DxKaOvbK1nt01944N912kn7nwDT6cHk1xWSwcEl+xmQVYNbBG19r51Ff/LPFZVvjlU8HqY03EidEnK9DfUnNdNyQ+R5GHWDMhxVvSAnaRsa7QLDOXpKi8I2NEL3MUJqKdVoARWOkedJ6eRg6ZKtaoXBCSJ9mdk8uea09HbL2pVHBLbl42jm+V1qzS5X6BsIGM7738i1h7cG8cUdveAVjm4KR3cSik/TImbxnDE8JMi3q+k7xHJha5+LW+8ygluEUw8kge+gqh3v9tyIT19bYL+i6hOUrrkuiFaklSk9HK8+1vVn2i6PKszYhoYM1oCOs529OerhqI/5papoulLW9UKi6baYiymhN6zzLohCFYpyws= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MLXpjIlYBMDJKtByCbgFQx0k3kIC9fRkWxUZvHrq0O434mWjfXwI+Im+8ZmKNlYRh7s5kCX409he3/sqsHzWM6G0b9KJOC/wLKMiRkuFCgxzsu2OHnFlQViyFpguml+cixUn3XwYduZXZ7m32q6tlTOhmTssHaO42WQW0f4ED5Fho7UUJ5e8jAyJ5O+M2t+r1opGikrHcPa3fj8YtQuAX/G69C05cQwnmyUfvwDGdkewF0tE1HsQqeheC1nYmNQpz/gAEKD6uSr58Xnc0WFMzKCB7nz1JPSTyj38f4BHUlEudUO9GJQHeHg+sXot4chZeuUMuKMAz9J8lnuR4Rz620d4HTvJ3co6lF1DfZs1KR9TzQWxxTKjjBlSWXm6TIkSBAWaPPoQsembeCLgiFFsAl4PQu3raQ0sfr33rzjEFYRXWCkp7qNwS5pyLFaCC23fG6G8fNzJ4d31zwpJpOC2GDGgMDzRlCrL091BM0pj3YGHAr+VUzZkaVZLNsvRRJUZEajDmrm5j6qRWooA8XCJu+76wIMgmygjRd7WjpMNQnQ1KW4aSFmPYia98tmQyDxk1ZFBc3me3ZQmLPmLHqxEgmDAPvPSYF3IDtcaouehdeO9nSq/jaA0rhOYq79QsRCt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QfVpDMdmKenNqkIvqi/mwqYHFHXctQDjcUccgdC+A4pwfBRbHXrhH0a3bn7jq/QtY7+FDhqzBod3cHoyh0U+jov25hVmIN1iAjkCER6bsn+FtHl3eQQdauQ9Gbwgu4UCacV0vyr7ktl2bZw0/jU4oJytplHZTeTqdXi6gP3QkQTzW+D02M1ATnL3jU8CjYC0uB53PwjcfVztomrqPotPx/0f+eg5Cbc4hLjF7HaVDfSAlFbwXq8KMaVp2g70BDPhxIkaTF51yLhrGbcj01kYJUCQy70++5aFaEi2M8ztcbQYn3vpCjfmqWYf2DLF6ezJd4IgNJD9m6cQXtwHriVVyJsUfIRGwV1AWeJkfTbSIRGe7xGC+bs0dFg5vhETJbCuE7CJ8l3VAR6vsDpRF9gdaQXBFLCrd3MPqnVd2kPM1TdDRN+y6rf08FumGdL0ZyKvMJd/7YzBJnOCtxBL86B8IkEgI6/aDWMfZNGfOXK/wF02kBbmnNX0tsZ+sF4811egybyPEiQrAf1514ipxvgB2Jcb9xJzLoG0Uf5RnPaETvBnwpHdt+CUVASoOMPWNZxpwkiiQbrPFdT9r4RixOYCHe2q9THMEn9u/V4t1ymMlBfKDgHE1EYUPd/AOOt+ME3HafPw0FYB2FOMyomlGLbItzHv6XBrZLWM2MiFewma9G6F8iK+TvDcDfEym3/Gmc0SWROeoVnD8vCLUwkKMg007YPF+2NbcwBw/47SGqzolUaGQPNc4ohvACIG69ACI+FXWqTJZ0x+LlQZ6t4hidGzqFx8Go62+E+oPbMB1+HhSsf2ub/L+/2bht4g5ONLGmKJGFfiEwcbeImlD39u70W0wDKE5inCDNWSV2uKJmic9TDBxDBmbV+0XWlUaD5TD4W3t4hGSFVVTDjzTSGAjRpvJUso6YtlPosaP+sTGYeN/AvBsrHZukCOey32p54HPSOyUc1uKA7bkyITIkaAcvpmPfwNZit01TUKnYncu/DEjVuiqHGHUGPGr0FcybKzvjS6551e9MlulVhR6yXu1G0bGnSCGXghrDK8jh04Awv47KQKz8qy/14QqY8qVkga5Kfv9IhciZAdQrnjFO+dygyDiWIn81hu8KqGZfHsf/14Dzjitc0iGXrFwVYypXd5Y871C8rnnMxvbZYoA1JzT/gBtfJMqFzNjf5s/rqFkuRkl3Va4Ux4f6u9Pf7lIOPISNWk1eyTYvUd9rf8puexWnJG1ERhwkX9bGic7gobMq2txDj7lBWflFxrfu9QkAZy+5xx X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7c49b33-21b7-4d5d-d932-08db9665ab5c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2023 10:12:41.6525 (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: DU2P250MB0222 Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/amfenc: Fix declaration-after-statement warning 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: 8bwIfugRauoC Signed-off-by: Andreas Rheinhardt --- libavcodec/amfenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index cb48f8c273..518b8396e7 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -720,10 +720,10 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) if (!avpkt->data && !avpkt->buf) { res_query = ctx->encoder->pVtbl->QueryOutput(ctx->encoder, &data); if (data) { - query_output_data_flag = 1; // copy data to packet AMFBuffer *buffer; AMFGuid guid = IID_AMFBuffer(); + query_output_data_flag = 1; data->pVtbl->QueryInterface(data, &guid, (void**)&buffer); // query for buffer interface ret = amf_copy_buffer(avctx, avpkt, buffer);