From patchwork Wed Sep 28 18:39:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38447 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp434208pzh; Wed, 28 Sep 2022 11:39:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4ZDkbuqiA067BjpA6Wg2Equ4t5SQFhbe6mCL9L+xLLPNM57esWsANavQ1ma3UmKsOeL80b X-Received: by 2002:a05:6402:1909:b0:451:ace7:ccbd with SMTP id e9-20020a056402190900b00451ace7ccbdmr34014017edz.276.1664390362527; Wed, 28 Sep 2022 11:39:22 -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 c16-20020a170906171000b0078093c07872si4810177eje.608.2022.09.28.11.39.21; Wed, 28 Sep 2022 11:39:22 -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=aVLzyPvE; 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 4303E68BBD5; Wed, 28 Sep 2022 21:39:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073056.outbound.protection.outlook.com [40.92.73.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BDA5C68BBA9 for ; Wed, 28 Sep 2022 21:39:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DjjKyr4Utt6P6/9DR32r8TfNJ/tqeGERfcSIYal8/gbNeJef5/YdeFrUMn3KZC2gvVVpTDrNMZVE4p4nvdz2Q2A9wmouyXFB4zXp0mNTnkxsSb+T7fOx7MOs5Ax9WDdj4zKDGKY5ul0pFXqCjNUAexDsVBwDZiVEEp6wGuQukQZ88QcJB7LjoksCWJlZ8W5wWUtHE3q3N8dLhe1L93lNx0mGYLVJFeK/q4vqnvOYAhfpFgP8wwEHMZmuzfxxn37WjXDR+qjlgF/tGcQPL70STmtcSJI40dDxlA83NJIV0OxfimrDFhk8qVDgMSKqKQCTpuuEMlTsQ5vMak8RHYUTXA== 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=XNoS4qCQxrqBag+zUjfjek5NOKOMeQY+eLdsntWzMB8=; b=lvQDJLoMMNOlWYXO2WeWHit2NgfovNAgA0zXK/6her6YSmBnNkbcmpijbRk6BOsrOYs9AmF4dQ7Eh1EevwOsz7pYHXGwQ1CfhN5jBp4gG8C6SwdE9NfmayE5nJuUcFPq2Ox9WPY/FHmqHax/DokG6RszbHJn7fCK7jjTzs4bfGu6B1EBuv8PQjZ+2VDEIaXeo4PCBjRLAIzuUKfuB1tlJsLZu8QEzXQ9LQ4Es01+h7bImPJ3YVY4CDj/B+qNK7+YnJSVETYgutKTM6OnKSBd34d9Qa+6kWl6S8mT57CV9QibnsvrHDNyVl7K3RO60Ap0xd4IDxkOb6ZRieNY/ZnZLQ== 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=XNoS4qCQxrqBag+zUjfjek5NOKOMeQY+eLdsntWzMB8=; b=aVLzyPvERX+sjOvnbAfS8yae+VFQ6vDiWB90WYNWicUit5Qt93Eqs31gw0l8OQX4WE1KafTZ8j+UdL3JAfyAId+aYPaZbDVkMWD/73B8ktChiZBaMXl8PinqlVa2zR8l9KrL2arfDAtCmwKu+p29x2HazVgyUnljNMkoi7W7jFBpCQigeXdjVMGMsLj8heEIXSOgS1e3qXxwqLIAILPWXharttQgqB6PLNA0UMg9YNICGOGjMwFylEa1GRaTcrDNI9hNl0L/04EMTnIBuIaXEMGzv+2wXbVz/kQdpKIQ/Nx5QBCBncGM/yoF6JfXECJunBcXG0prgf4Ctbm00FvFWA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0132.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:177::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.17; Wed, 28 Sep 2022 18:39:10 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5654.025; Wed, 28 Sep 2022 18:39:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Sep 2022 20:39:09 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [ZA+er3H7ZaexkavZuntjIB36Y9ToaXof0bEEhP3P/Eg=] X-ClientProxiedBy: AM6P191CA0092.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8a::33) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220928183909.937310-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0132:EE_ X-MS-Office365-Filtering-Correlation-Id: 68d63f08-df6a-4ba8-571f-08daa180bb18 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpPcoZqFl/i/jhf7c/pX34TBeitf2xUC8+Zt9FoyHyPZwaQ0WP1j/UQGQrOL2tqhh2zJBElW9T7xe/9gnBFUDb+uiEI0MsrDTVRl0nHa7m+wP90UUSAmkaw5mfuUDfQjx2/7wL8HRrocy9CBAJ6O79Ik+WruzVam2nMbjG65pJXJeAHQS9Cq0ntSI/nGxx1Yoj4qCxT4ezMoGyJLMFPUEZyAruOicPWFENsfG3OnO0F+q+PtrjEqWrs/swjN1JHg24SbalgumXEVQny0220k5eXlyriu7DtRiX2byDFEIhbqeL6hL/evvN/R73QmHyAEl49ShAS9AZ92oxrWIvI+iQmK1YZh5q13DLjZsq/n6Pg/wrXZHxfgDwZ0LUI9+XP0TcE+knuBq/j7Utjl0d2RIlyq42vS5v9ScRbwzkzarTvmojcLIg3Pc4aRi0UDrIAmF+n+a3D/csi68dhL8+f31FtmPk8C0ga1fsXD8JJLou+85GqfaFsGE7+yx8PosgoPIaEhatF/GqeBAbQzA4lBzQwcxTbbgnyEtBwX2yQAyehFMIweE1MQt6Hy4THi+8Uj21ZUf6xDQ//sIujAuhaDbBQMfAnHaFsTuUf538Q0EDLvLBdPdxR+SiCIp9esiE909Z0cQQxNdcQIskyMWww5jIDxnnondXjXGTBpfbB2K7qrvHWrvCcHYETTzfhJu2QqBww56wpXzCRYTTDL9SZ8Hom/RFu4XJOULi44zC7BReZhb8f8NyFVu8U8aWj1lln+zk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XcCbEKWYpoK6XT6ZqyS4hmO6q8fzxakRt1bKwNH6ZJT4VCRP8AHVJB8ZGkjdYpV4O2sgUtKqfuu9MTkUM/tNCFPpMmSQDG+0PTRB2GMhexkX2ipEqz+V8QwK0/VpSNvOV/uUcQl3StJi5221XxJNX46od+cap4NBl4QtIFrQqNUwIL1GY9bje1mPzUa/S+K1gvVt3X0K933/HtknIkx091tsF3lpz3NTKyCJIjR+TP4pnW9X6q6QdloqnFAyXe3tXKZK+foLJ6GyHnY+VBOt0fA8XZFhmbHW2wBumhDLgW87/E7oUTHEiwiXB22eEenAEp6CtDG3zdP817nPy7uq5qL6nEOPz/97I9ubEybGSsA3iZ2e1lcPGL0nn5DbACe6BaUbfeDTpZDGdl6ZBSa+WY2FJBYZAcNkosDTqidlRjl3IpPPyRty7406WGDHm1wJ1bCtmlk/mEK+G/4XyEAmH1WJ/7LI1rcw/1TlPgoBGpk7Lh/p7eHQT1lTy/kFf1EXJf/IOY6urrrHNLSsiBnyOgodGAlal/cUGx/unvZhoSAhG8miIr+U7ENTCJFpW6gdfxAvRGHdded7CJGjqXQHzCKF2qBIBaBajuEPv2WHMy65b3n6GB5U2S9MChbz3xNADw2mEOELiOaAd1sl9i1Cyg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VNLSSCQPewHetAhEHGno/2kwyyxJq49OHXHHCuYt8xqM9OVwBmYnwb5VgK4pzs7B5W3+nR/JCma9Ca52Eaa/sW5a5VbooGRxG4sOaWYV7pfAWaUcN634o8FYeSl1zlNoY1CppK0NxtYHMlXLtECrPjCACS9XpbCfiPnxpwsvd16tG0Yt0NlaEYmoGn3kDEKifRPm+tQD9oDWQcZ3xbTgi3FMZKFicdutt+1j2nOL978dYcYYWckEH+cqvmsAmyQqbe04AFmV9u7Sks88CPJj4EOa3esMADj/AGjAaTVTNokvl/0uMQEoFJelqSn4SWooIa/qG9ClYtZ6IaVfPt8M6lYtaf2szJJS0XuSBYzQ0mJP+h1BymnO1k3lIxzNktyHurcZFh2FEEwAYY0NHYVUMfhvCIbzMk4QyeoQZZ4CUsZQUVPhZVEfWFGhFqM2mZYw3BXB+SNkpNNpEgpZV12UPxmY91/fk9yUp5p6FRR9TAPTk7hIgbYYvxATLcsEy7sageeu5ad+7DRBW53NCipUg33MyYvR7BZW4KlWGILOjiT68HU7j5tw6f+whV0NOVNy6b9Lur+v5BAMd66CaUiEljIfHT/HTBQA0wysNMS06M8xjSqYKRYPMOhOxPin7Ih/xdn4JCQG+AVcYUNQrba9GB4QhHr2z+O7Zb36FTKSy3i4S4aWa6DfpFwkFrYjxz6K0nAOCpf6DRGZzkyAMu3B5Gz+5nwjuc+iD4cgM0Fr7Vd9kgI/eZVOj9tPDvG9K8HuTIo9mqBW7BpAbqB2Pu/oIjZo1QaVbgDhTaCSg0FH6PH6lmGEvkyAWtNaf1rnEgG6XVE8R9jpDatOCqKr80qK0E3c/ZLxi9bAZmUtftuFC6KgoprVdr0lONXQa3r85KbBfAuL8731RCEEK+xSAtKry/lB5R/rL1HVhx6s3rXNNIdW43ObdJYecmJrX9Yyx9WR055jql0Q2NbCy6nHsTiEBDICSdTH3VBCwwTCKaXUuU0LjgsnV0Ln6KvhJjkIqSwfCQTxHf5nhhycRI+b3TwMGBM1AdHKXEsVINehYIRGmqWPDC7ILJrZMQoSTEKfcyJZJijEHpoQ6HI8Kgh7mPhREOORVlwDlImttth8OrazE0nM58hk1d4E4V1QkjYW+15dQ9pLDWcTW/ztGUN4XNfdrhvnU5X34A5C1o1Mwq62Y92dQITl5aOsa1o2YgcnzoUzmFljKwb8ao/qKrpfiTfZP/e06OGXkgAFlbz7crbeXCXLHA/cyeXN5DSOLxpmtCUl8DY8Heqx/eNTa4TvR608c9OyQlhlGofYqhXvVO4IJu4l79ZKUFk+tFCyUmtPrYFj X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 68d63f08-df6a-4ba8-571f-08daa180bb18 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 18:39:09.6148 (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: PR3P250MB0132 Subject: [FFmpeg-devel] [PATCH] swscale/swscale_unscaled: Fix undefined NULL + 0 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: dOWX/QMzcEnZ Affected the fitsdec-gbrp16 FATE-test. Signed-off-by: Andreas Rheinhardt --- libswscale/swscale_unscaled.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 8838cc8b53..0b97377934 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -695,7 +695,7 @@ static void packed16togbra16(const uint8_t *src, int srcStride, } } for (i = 0; i < 4; i++) - dst[i] += dstStride[i] >> 1; + dst[i] = FF_PTR_ADD(dst[i], dstStride[i] >> 1); } } @@ -729,8 +729,8 @@ static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const uint8_t *src[], } for(i=0; i<4; i++) { - dst2013[i] += stride2013[i] * srcSliceY / 2; - dst1023[i] += stride1023[i] * srcSliceY / 2; + dst2013[i] = FF_PTR_ADD(dst2013[i], stride2013[i] * srcSliceY / 2); + dst1023[i] = FF_PTR_ADD(dst1023[i], stride1023[i] * srcSliceY / 2); } switch (c->srcFormat) {