From patchwork Fri Oct 21 18:59:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38876 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp927395pzb; Fri, 21 Oct 2022 12:01:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4rrxmyyzVx+VH8IbVTIlw8sGVdg3drKNjzTl/czOUNwqLbIvnWXeN3Vvt1pFnYrk0hAo+T X-Received: by 2002:a17:907:272a:b0:791:994d:fb6a with SMTP id d10-20020a170907272a00b00791994dfb6amr16932600ejl.337.1666378871258; Fri, 21 Oct 2022 12:01:11 -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 hs21-20020a1709073e9500b0073d8b93700csi21377075ejc.165.2022.10.21.12.01.10; Fri, 21 Oct 2022 12:01:11 -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=OTELHULn; 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 1ECF768BEED; Fri, 21 Oct 2022 22:00:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074078.outbound.protection.outlook.com [40.92.74.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A9FA68BEDA for ; Fri, 21 Oct 2022 22:00:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cFvg8+iPnX8/O3Xpel3dOl3Le7fen4mL8y0l/qTFX1EDByShFtoBg/umwmBa3Eq2c+jBkiv/40y26xW3ROTw4bXVkTqJRJkZ93vSXjETBwTLnyy1ycsS1MNc7PNS/b/L8UCW0+vSbiWofP28S40gvP8rLzMjaOLNcZ/ubsrOrIEd+YckVVmh+HJ6e6xsatMd1A//ZnKPJxpfq0r/d2exosQSbnwdoSD9bC9eXyw0TxODNlr0S663ns1Aj7ycNUihS8Js4uRbaHlnC/eq1+E7ch2EWX1jOSa4RP3a62jq6TwI2nnAKEQ+a9fo5K4CAzhyYpS+1bwa4UiUCXOo89qrsw== 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=LmAM93CWjafGnMoU/YhLiwjbuhl757ulHpDhSJFiYaE=; b=mNGjvWz3KqYz7XxTeYemQbSWXZhJCUeBJKbDXw+9uheQyk2768hlMOvPhz6aNi5Kd5uk94PoUSi9f4/OnAEv20tUqPtJdLpoSQOuhwSbJ4uZMJQ5UZMRYo1iJig2tyaqbNiQuARhFSMpEFgqkFy4LEhvvesvLfApG9ml25MNlovtPwdGFHU0uCQdZL08YKC+pW0qlmFQ3ZZf5EvvDbjl/4/7BIC3t8kYHlTT7CGAyBYIvrw5kB8Gky57itWUm1uwLm5wNasc9uxytk+0TylcgCT2vAkgiNz0LRTJDERPYHYEsRYrgmbUUTwVBTLANls7c51MJ+w33ji6bAKZtNJklg== 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=LmAM93CWjafGnMoU/YhLiwjbuhl757ulHpDhSJFiYaE=; b=OTELHULnmFEPKCQXr1pCaeY+aWLqlZ4JWwsUZaLF6ZNpFCTzmLSY8jjatX86iWJFpfrTt4WGKAgKU2HrRksFLaEilP/IpesTATY9TJP3Qk6Bu7DltbzIYk5udIvu4y742KmWF/kT1buZ/X+H61lTjj4sHJo3amBSXurJVvTUcn5ZtAAK6edCLcFHuF22wOcqtCWpno8BFrGhmyvXnGMnFMOF681klWAVHy35zB41Ir0h4EgkgL+oKABTy85NZHmeMINESkM+struyBjkfM7zopqvb7KT3WpHhHfQYBcyFMu5NZ3ifg8rw+xHsBaxhxXcMzfVGJn7QQhJ5I/NNo/Iag== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0491.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:291::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.21; Fri, 21 Oct 2022 19:00:30 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Fri, 21 Oct 2022 19:00:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Oct 2022 20:59:39 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [TXeSS5/X1LDOjPgek8r8Mi2BLwOwnOXBwHy4pNgjmI8=] X-ClientProxiedBy: FR0P281CA0047.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221021185939.3096155-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0491:EE_ X-MS-Office365-Filtering-Correlation-Id: 43713aa3-5868-45f6-9e0b-08dab39685f9 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmoyh0/rGpTlCzjnzrUxdxR9YQU+dY944oB2PJsg1WkHMzCtTU5rpjnawq0pwb8H3KfhWnifsYe8fL3ithEQTmhU/pOu5ZXRR30QBr9UTpS2wMjO0002aQFavyruxgUq2JO19TVIYt1VCQDhLYysP7B0+DwDTHzte+kXzqjvyIy4UPPn7X4prwWkdD9HB+fE1jkdnwpffC33OfmkTKgTwtFMTOObw9NJDvs8v6VMbeuNmOCpMSFFY/hz9N3kICnB6Awft+LJ/9BrtVvYBgw+RWd4ipdPWBi3146WPI5f04NPEO4FT9Dmtj3HNgPL+yatFTzv9QR5hZO/32xhVzoBqHyUEXsIM7bHjKYq/3UYjd6C5cGoPYSMRV7I5ihgsAtpVNVuyoX6jB82hLMr2PjtAO7YImRf7x0/Okne9yyvAN99j+rb+oK7wIhKidhFpEQnEdDuOqwYPejyvnigD1gEuVmkXJWYxQMACDvJH1NCp1Z29GtGR9lZbKrQZiNFiIR91k7iLSRspfqbxNmDi34VV33iSb/4gFPSLyNpvTQmxxs7WAsAb/KFw2T2tfqkpyvO3kejFbBeynoLxakRh1WL57UjxpYlkfzDSHaVPkKghwA1lLsQJEz5WdAAvU7TVPjVIclpLnvKa28h0+0V9tNmgxG1lw1drvzmG8YwLyEcSwP+Z1xJ2FQVG5SxAJqU08acNHnp3hqX4AmVbpLB6+fWCFzuq7aqhHEgW9wPvbCEvdXovChEKQJ6iSCZIZBhWn2UH0c= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nyPanKDep8uR6THXzvhVxVPiye+WXWsri3YPtPbdeKZnZIdnK/FhOtgjnB9UWp1876rxXwf2vM/izGB9NUHT92QW7iaJaMfuGXfKAipwzUobTpZZi22w7Qy7uBoE+3D7I07gS5Y1OQ1u0V2HoLOJYMlsbiyZfM1eEP08s5dHCrRR3J4rJufYUxCeh7E591ZP8g3qVKISnrvzviRrzL0EDiFsgcqTfrXtZiq/fIc79nmU608H418SMKtmOKZ3W1RFpU8sw7umWZIE6/8iBfXEr9T48tQzelw1s0SM4xY02a9KHr4JQoEebmCUqvgRzrL0RdpsUlrX20YdOgzYG14YHBGP0ePpm1k53NwMPEGPqmezkY/M2kLyIOGl4m1LYKA7hMikTw3s7RQxpiuwL3A3izc5HbFBxKQO81d0G3zQOIVK1j5U/B2KFRpGMV8L2MdJZXks3/QH3JqIgO2ONFfvwA7ydpIMR2i7nmiW5AOZuPu6kdGc0YmommO1/RbUwFuJ2rS4aaVMgR6klrXD0uAMpWWiUk6vTfZbBpY4hXGlzezwHDJGDhBWig1QWgAWo99i/KXWfb54Lp8d44l92O+8jkygDBaaveiPyEBUrw8RHbdWsEhZhL2rCglOky1U8d2Q4dKOfiuFlFCOCPrdBwZL1B8SX9tR2nIn3Qj1AlCBpvAwEgTrqJ9ZFl3xh4aCjiqe X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Q4olCBqwqU90YUZIJyv6QsSTYOdTYVqT/1lxC02BP+ezs0ldYaAKWcNVHjE+KWlzVhBSE1Ii3D1YTogUTzP2BXkH5x6+0tmRCmiDVIDadMQ/TfGnWo723LdvUVZlIXi8Ob54gzx7IRMLOTJdaREadF4k5HP+9aXhWFeEJ6aqS7fqtbLqx1uEB2n1XtGUb3/hEpI6/eRSsDlkVoTPHAlZJhWLOE8TP+jWh6T2Cvk7sNErlGlnBJiPwxRKb6UgKePxKg7WHD2Of0lzpKc7j8BuZm30goTtNBWVwzvNCVdEuPiMVPG151B4SnHuEBuRZ0UPo9NHqm2/uQJoghiJG2aftdS4yqzRavVCIb7UwRicbpdglG+1qtX6FkeY6b/qBShhp7W2L00yBYUdocJjZ/77aA8eF3wV/k3Mg/LjTdaDlIHvmU566ilir3jqZdfs6/OlIPyExWK+7E/CD8ZoGf4vKJMu9oy1THTHWBqAdqRxc/QjtUxcC/AiMPQf6SFZB9osS6QPp6+gNLDMYpNPwaF6Mzd2068yGR9aOvdxwbDw/boxApVTS5HvFo7W8YkRtUIudySzI+2zmJ/qWQOpvo7LywfjundpuaowVofsxBZNBgPzjkrBeG/Eh6KKcwgshkLhgfeLjVrsigS8bUPoRE8kcNRB+IWo07M0B1b2WVsCEOVHKfnSem05SLJ4jT2TaczSUakmHjMCQSpRduAev3DtAn8Zj255cBddn+psAA+EUEgvsV7QIatDq+Zgyw/TcaAbh5tc8a08b10q9T6RonMvzJ7E7dY/FQzt2xDPMtu8o1zSeIcQOz/vi8bIi29NRmTAMJab9TYIFAgfzjiMtAK+D+WKSaqk2W0/WjY4SKGN2o/1b5NKgFKAf00Cs/0YrCmXp9gM8cH3BkG9B/rgTzEUmAms/DWflHZt4VI263PiM891dCL9BUkANuL2GzafBqJTDeX7tfuf1L1TUB2R2q9RcOmV/jdkVSBOdF/lAQZxGmKNvFvl93uL7n/Pb0jp77ecCaDV1KbbEbup7Odi0FgVEFGF82eSclUilUdaMyhi1zxuv6KML7dc33BmflULBwkHwtvrgXAJXeqn2GCaXyp/AQa2Y4EP2/gJVuiK0MnUEK3r57hzGUaFApXJM+shxOIjnQfDgzWLyY2HvKa4knuve6nHQ8YGpcWwu8ODn4LQf4xkiZg1yALmCSUaCgQ2uE2qvJf1Q/7MwGBVEsVpcJ+xOr307HNFRqToiEh+HGmS+iV9BBAngPSxVSEIzHM3UBjx5Um0WabEk/eQErItmpK5Idu1rBzENRgopEkDX+LPe+k= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 43713aa3-5868-45f6-9e0b-08dab39685f9 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 19:00:30.2728 (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: PRAP250MB0491 Subject: [FFmpeg-devel] [PATCH 7/7] avutil/integer: Use '|' instead of '+' where it is more natural 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: VyCrsMLwlDe2 Signed-off-by: Andreas Rheinhardt --- libavutil/integer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/integer.c b/libavutil/integer.c index a692c3783c..d0a0f62c9a 100644 --- a/libavutil/integer.c +++ b/libavutil/integer.c @@ -104,7 +104,7 @@ AVInteger av_shr_i(AVInteger a, int s){ unsigned int index= i + (s>>4); unsigned int v=0; if (index + 1 < AV_INTEGER_SIZE) v = a.v[index + 1] * (1U << 16); - if(index > (s&15); } return out; @@ -161,6 +161,6 @@ int64_t av_i2int(AVInteger a){ uint64_t out = 0; for (int i = 3; i >= 0; i--) - out = (out<<16) + a.v[i]; + out = (out << 16) | a.v[i]; return out; }