From patchwork Tue May 10 16:21:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35718 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp3491197pzb; Tue, 10 May 2022 09:21:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx6CAGo5u7Rt8nFR04Bny2u00yAX8bSkVIm/q01sF4VOulDhl7a5KlFslbl0rzVO66BcagP X-Received: by 2002:a17:907:1b15:b0:6d7:13bd:dd62 with SMTP id mp21-20020a1709071b1500b006d713bddd62mr20134690ejc.673.1652199711831; Tue, 10 May 2022 09:21:51 -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 g14-20020a056402090e00b00428c1ad1ea9si198898edz.564.2022.05.10.09.21.50; Tue, 10 May 2022 09:21:51 -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="kmK/muWk"; 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 BE9AE6809C4; Tue, 10 May 2022 19:21:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2105.outbound.protection.outlook.com [40.92.91.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E98EE68B264 for ; Tue, 10 May 2022 19:21:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H2I5FgnZb6BmiVc60Egxop106JbiMwfRR2y6CamcaVCp8nzWMvB0+aslcGZdoXQLVntUbGPlvM9nrdpEVzSPGqiipzAuJWPoWXotdUGk7xWSjEeUZbjYkoseaxev4BqQY3QppQpzp99f/gluVKKYn+M5ta7zmzsMllHbjrSPeusqSg5tBVIIwqPb9LXuhZ8qn4FgTGO+YlGXtrlc0jOKEDD8NUZDg738eLMhcsLroFM8Rsp6ui3kSi116RZ9SXoym1guaTf/FQKqP2grvZlODW7uC+nBDI9P5h7I9gAH1qaJkR0+BxMdH03/CljRs/KMsuW/L3ejPQB9xIOSlO3I4g== 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=+CHaSs5FDHrXYTDGtIk+b1zI88m3Y/ag3555AlKZd30=; b=PP95LU/4qJO1Yq25lTNTp5Tp7a+OPxPi7shKNtHjhqPh8DQYRR52i1r5m/23RRbt4G82lL8TLLIio5OtevRpMSnCSVWKeKiW61RaeVuTX47nrHsYSUSS5Ut3zZIY7i87aRH9rtySm9cprVjGXI+2P9mxCnvY6KEYzrnw5G5Os6Bqr9GtHr/EEdrYp5IyNwuUSyDto3tT0vhQp1x4zlEiC15n4x13gbR8addH/DXx9sV3NcyvXp86tpVO5VVPEH80Mz2/B5HzGYDwI7/i2gdPa8hmSWfi1RlxXedBbpAnCHPsGxEL3djHRL05MdNy0fPFNWYdyTZc46wMbANotVObwg== 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=+CHaSs5FDHrXYTDGtIk+b1zI88m3Y/ag3555AlKZd30=; b=kmK/muWkwhCY+PICzYA4TocWo/+PMkOOOue9aZc6Gzr9E/yTRvyf3xgf30ejLAxgCmkjXbzYnEoOHL4ITMwhXyxodzZPFp+lCd9beDFGR5s7xd22k3eNG6mSNjwyxGDkZTQ90O+lTP89rplfP8sU7GVJXFFKvtnfVfYPNmmbSuO1hzHbb4vLmUBgQaVKltQ5SczPBZwCgz9R3hCE7jLEkuAnwgWOHHKSJ8NwzIuXeewi/HeDmknrht2DpCSG9SxeMmAfkngTmN3Riiz7L/IYgSbuydMcESn3VIxVVtUuC6ElMw/BdN3L7iRvLlbnFLYSdJjk8jLs9d7C/2/Ub/WJFQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by VE1PR01MB5661.eurprd01.prod.exchangelabs.com (2603:10a6:803:123::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.20; Tue, 10 May 2022 16:21:34 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%9]) with mapi id 15.20.5227.023; Tue, 10 May 2022 16:21:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 May 2022 18:21:26 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [MeLdcKV/im8THjdCEqPGh9DorOJ2o99v] X-ClientProxiedBy: ZR0P278CA0006.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::16) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220510162126.685586-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0002ec97-5c0d-46e3-332d-08da32a12667 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUwegcyAIs6IBoom0IJFl8GM0Fp53WC+GjV2DjPTBFJLRJktLs13U/21b6WUqbABtt0DsmCDJDmtmHJeeuvF5T2o5Ek1dZ55klvIZgQp2bwqMLZh1gE1GrsR/TOCDn1V8Md3UgSmIGnRkNBnAJWaBeCwwkcB6ETO2ekcz4XyCczAJqphCXlAY87hKGsRsVNPtUIp73sw69w5KkAVvDHgpvY1iftsWbMLF6ZFgZR85b30ZjFq5CsOV9zmdAzIMRmYoiVkI+3UrgA2h6MtwD0RacelUXlFw/4gXzSxGx18mha2LXcwAWiihKTewTTmhGUeKa/aCnFjBQ3c7vKIJHMCqceZR+yzGL1WNETSdvVEkirthaEE4nzsp8zTe1LDQxYcY2cSAka2sdBjtjDX0H+UWN5X6S2QcMiHucXExT10lr07F8Zs5rAdYRuNBWfBjCWOuw72tSuwFCkSRr3ZhS+a1hdPz88qkuqOwpup4xFDV3xz8J5pNa1k79AHY63YpnimGMAo7j4qidAvfyqMqlGznvbN5kY2BefS0bQKm0IvVw/uszYE/56/xeEFQxClrMusB5rWgZW6uN2vGWjiw06/ecqd2uSVUhzkng/H3BS1OpEgNNq5zJlTdTl0G7Td0xi4ryW5JWe0b+13a722IrAQ6Trs89iBGmycqUA6NKLhdA4wmIM3Gtfbgbx+B/WlzABClzq13DOqX1/SdGhZIjjs59KtXvS2YXkxbk= X-MS-TrafficTypeDiagnostic: VE1PR01MB5661:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SPJbNf0mraAIqePZHVfaxeFw8gvDmtXigq80yzNnc06ps4M3OjsZVmdQHCBaSJ785UAZCMMd0qMr1tiNXfSxnGM21y0D99n9CbS6pAmDLkGyrJcT9YxNEBpztu8oQ1cypo23Wjps5x/Hafb/i2uqV0EK9+5E7QVW735V2tkU8vcQCQWV02MGgH7oA+f4h9niroztxQiH0qX+2PiAqs2m4+goySguVcFf6KOrXnh+T+f76ZROFiHo2j4pChlT3oztyqxY46OXz2etGDjHEwpLzGJZjnp+/cFc2HvnCpx90RP35J0oYzpTbZQ7t00W77d1JDQmIDCxHuz+4e56dDfKjDIOfZ8Pik4b80In/aHvAArz+foJNhHo//wBEn22pSeV/1KCQ4IMhl5WKYIGgk4UQzoqQ/KNfImNqxU9GZbjn7w8r0b4HRihHlHb6JIyI+I+7D607IbvKcaee1erzsftrw5yJvTJ9p4CLKgXtVxX7TrgvlUD0DEhZPUx+rHPmb/SI/bl9xcXMDM32RROtW4eWRpjrqXohpB8G7GUZeN27WBm6fnd9qeyvcwk5qv7EXzqm1k2iiCIbIHCEqhaUCg4xNjHSxW+iWH2QggFB09gWbjAYH8BKMJtcBEDr4kDRiT62ngznglkcFSWP68FXxX/JQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4jPNSrh3vNuPpQGmcDWrzUe0x4dfEvIP5P/PearDY4JPiOAo4bjfOB28r1ZTorrxsmeNp4sEg+A0Kk267FLlSRswxAb9uNEeOerK0YVs+HIwlgU+98k/7ar7HL5wOJ9yePGY4HO/0X2nHfny2XMlXYvXAzqrfdKjpq5gxKcHyRwa2+SJzfH3AcKw3fFRUUDW48wBX93GhHLZ/58UPYOM94D9AtchtGes+fbpbS7v3ITCvqhoI3/t27BSmblC76BN1t6IYInp/9bzw80zV7Mr+e1OKqKPNlRuwJxnDHQjlJHREYOy2yABGMxTpEGS5U7awOd9G/oxG+7J52AG4kBG5g7po3AbQHw9AOlYQJDZGEI1KvmIYvMOPtI2gPztlu4+w5I4qOeP1i5iJMJMUanLc83X/DtkFQnR0pGcPscR2D2ByaNku5LKIo1iYoOl12pJqkq4SctuOoJSv3du4t9/WutA6CvMZ9S/Ry5WlVDt8c9y3JG4DQgn5cub/XM/Rmwm/JghfUYs+iZemT2Gok1bJLfQedg0BkW1S/Bb9l4n2ff0/mqKQt61ekKm4qaJD2SA5Abj9vi+AUgKscS0Ybt9K8BWxPvzaPdwEtUFmjroaNhkC8uJFTJb1fQ/3FCR9391AB1TCAMrS7K3WDkAE10Y68ZLHnsTz7hdocHTeoVUilkoyHcUjeWuL4wJwB3FKUjT2Agc22gL84A5aomFiX+Q6FBwWVCU3ZMmcrNgVqKPPnv5Abh/jgR3alxHkHLN5ZVltVOgMDt+FzKjxtrxWj7ccQXplmqWo2kheMCeDRcQvAn72uzzZDtRvQcVkHnAAwHRhx0ulxjzpyh6hFjC/bynyg0GWH1K9qEM5GrVVoeyxB7nmYlUmLEgB8UKehx5LHosPe42TNWdpAlukMcAFvtex1p5cFc90TwNT5s3lN9JqK34UX1F1aDTsJizcyvU/0Y5VtyY+V2RG58yhFdAMqMHNLhnaQh/BDgJ/E16pn2yEsFrLgokubcsLFP0yt4+uOC74O5NocJvFNg5wYM0iAhL6YqM6Oxt5RQxapKldFyCsMPCyKKs8E6k2LhTAW17SAAFFRqTcsprcDTeAaoeiZcEtfGKFVkKeqhU3sUmN2A16Y7oi+5TMQrLE+hii2W/cGL6kOZdCzmQVwv6lP4e/sBdM3xkjYyS54G/U3MfvofkxRvAW+C+lKCpvM98eNj0Ej6BC4pi6zAhJF4QWgO2uulUXwdIP0X3y5YdJhJxYLe8msrIS+HTnneYkX4JYs7nYorQ7pW+zIJFqtodJtbbFwucAUkxkZsLOD9krEVP8xeFbf3oB1Ew5PBPJ5LkvREsCzH5rU8xvqyOi/GxyERv5ckN1ISwuaTd9y9Rw9sgJOHnJgODHmOlefRQm0EjfDrWEa3s9VTaLc/PsT6Ecrve75peoWZpj23I3fWLM29/h9zd8cTbCvdoAypYaRU1g6ZNAoLNlbcCG4zdeePsfE+vgojnwA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0002ec97-5c0d-46e3-332d-08da32a12667 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2022 16:21:34.6298 (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: VE1PR01MB5661 Subject: [FFmpeg-devel] [PATCH] avcodec/texturedspenc: Fix invalid shift 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: LzQ4NahDfyC0 Left shifts of signed types are UB unless the results fit into the type. (Furthermore the value to be shifted need to be nonnegative.) Signed-off-by: Andreas Rheinhardt --- libavcodec/texturedspenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/texturedspenc.c b/libavcodec/texturedspenc.c index 381be16f75..21e341c613 100644 --- a/libavcodec/texturedspenc.c +++ b/libavcodec/texturedspenc.c @@ -181,9 +181,9 @@ static unsigned int match_colors(const uint8_t *block, ptrdiff_t stride, int x, y, k = 0; int c0_point, half_point, c3_point; uint8_t color[16]; - static const int indexMap[8] = { - 0 << 30, 2 << 30, 0 << 30, 2 << 30, - 3 << 30, 3 << 30, 1 << 30, 1 << 30, + static const uint32_t indexMap[8] = { + 0U << 30, 2U << 30, 0U << 30, 2U << 30, + 3U << 30, 3U << 30, 1U << 30, 1U << 30, }; /* Fill color and compute direction for each component */