From patchwork Mon Jul 11 03:04:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36728 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp1109812pzb; Sun, 10 Jul 2022 20:04:33 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u0o52RfZJf8d+HMVcK75S1/afEjr+z64XTQpyRkCCX+BJSnliM/oY52OZCOiT8ce/UZn27 X-Received: by 2002:a17:907:96a8:b0:72b:40b0:658 with SMTP id hd40-20020a17090796a800b0072b40b00658mr8571778ejc.3.1657508673309; Sun, 10 Jul 2022 20:04:33 -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 hs8-20020a1709073e8800b0072b3a86922bsi9528605ejc.455.2022.07.10.20.04.32; Sun, 10 Jul 2022 20:04:33 -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=TSZ6FROd; 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 C119968B586; Mon, 11 Jul 2022 06:04:28 +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-oln040092074077.outbound.protection.outlook.com [40.92.74.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1110868B586 for ; Mon, 11 Jul 2022 06:04:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MdWJX5mUa+FRcfM8Cf978I+nbfTZbOxhQmc0UrPiJjmHawoI8BQX23T84d+P3xWCOxcN2YBvsl0NCabUqeVeSuOnVnazujvfTWSnbRZzgSCNekUfdovHyoXhLT+FDGhOSWvawFRM55RApVLvWCF97FIDgOg+xI2p1INt0zIjBYCfyIEq1aNaLoZwxt1aO8aIeTBMIDR0BnMSVxUC+aci6WF2TssQlaJ1ZGrblhi5OnJ/ANBGcUZXRU5eSrD3CPaiH9KV11e+yJe5+O4M7foqNPUIGizipMEzoPWZ4n7IclB+2xDWA4NEEp4oV3DdKEp6ynnpGJt7xD+PvSmqzQsL6w== 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=sQJfrkogUJdty9q1N86P6q90HPBTQeDbPptyK3/zTGI=; b=LZeyvXt4eqPe58UF9wtL4UCB/UuXl/Dy6uEHUyxhf101qFoJgO5+C6ylqIVozo4S5hk0ls9OLtsSFYC8wH8wH3X/RDeX9v0sr/v9BTbFq6Q+gw94C/7DYdhaIFRCLB01l57QCAitWxdHTMLZ6dY60UJaMk7aFVL/dA7oDLpZFr/sAkeV57mBZRZqdmAhYOevQ03tPp+BOUWY0gRA8rz9S5e6LLFKaEnzbYymMdezkHak7u2hAwn0Ky8MloDXDC0tlNw2Nbtg0/klZw0B4u46DqGOryTtWwQK7RWRXzdRN3Il1eeaYXSWd2wUaB45vTvsCSn6SbdKVGUql3d5fl6F/Q== 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=sQJfrkogUJdty9q1N86P6q90HPBTQeDbPptyK3/zTGI=; b=TSZ6FROdkC+RWhFLdR8yc4Pk+WA4UB16viO/S7JKsP00YIBYrenr8W6fcHY5H1IkxUGoWgnUXDI/HJek2XEQ3zaHVVdaewmPANRFsW6nDGEW+saIUHcAnt7Mqmhpw25FLlmQMJcyjQkRuXKZuIw9yZMcwL4ehxGF8bC7mAV4v2PjpYskl4XrrLa99pzsBOiyQDLEQwT6uBUyiGLCptvO+61KR1o4saG/Pd9u/0MJhXTY2qJ9fsY0AFsZXIMRrxZ41HAOP6VayYNBEgkM7KcuQftYv/RGTtr0eK+yUeizGKoUvO+5R1ALDo2uep1RApopmUmxENTVPf1Gpfs0Glp5jA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB9PR01MB10170.eurprd01.prod.exchangelabs.com (2603:10a6:10:30e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.26; Mon, 11 Jul 2022 03:04:19 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5417.026; Mon, 11 Jul 2022 03:04:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Jul 2022 05:04:07 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [eFcyXmXcRB112Rrp1L/D48E7s8QEld3W] X-ClientProxiedBy: AM5PR0701CA0019.eurprd07.prod.outlook.com (2603:10a6:203:51::29) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220711030410.3306432-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 59a2da80-6938-4afa-0faf-08da62ea0b3f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQpgUKb+VO8j8I+it/2i4oyTMymE8LAdUcUEsO1dTHI6uqLu0ZBaHjll2jPWEZt40hDan8PaxCQyze5gC0FX66KFBRt/XV6Dt3ve+QXXd/W43+MdeuQxr4/Ayvtg0nzcY/Q6ikAiriNLbrHkvvBfv+0AHhwpOxNyVkwv3Ly48zzGwACgyIjuK2L4lk119E2HdWb9OiVd+L/uSk4SY6Kuy1iCnFORShEFgNRgoklgLCkVc9hG4wukGEHZ/Gj6XGanBAxp8tgFZFrEaSnen/IIcPbZmyclVc9rsuEt0XM8tyz8GHJfElXTbVgbSdmyX9Zxg1QmPavHr65Q9NZswQEs6BXB+WsqCFfvjjooOq36US0mkqrExtTV5nsGH2EbJuEyEj+kc/2W9VG+PEfW8AWMxQ6PgK7IfrjJ+QwuJVMmwK7KIuqXMH0AtETBPbg27RMOaVUSMxqIefPZHlsm+bo8c1/2sDu53B0GIPTzXirP2rnf8WGilmQZPVdA4OWDRJK/qqR7YpwPZC3lDqwju6XqRGpqjENdH0vQmcZAbVLwOfhfhv8ezbn6h6vUD2QjgjKjgcrCOVdF9Ojt7nvmi9AjUyUYeMUli71h5mO7XBVeWcUjDjd4S0+oE2Bs8UaVjFR7hDS+jNLOWv+AesPugXky9rQsuYDuSElRoEWd1kdkNdGiEOhIVQGrQlTcjm5UkxrUGNw0JoQKoTtDaFHhnFSsl/q3c+eIEr4bRDdild8a9dCjg085oIBHI0CSRJXXJfrCms= X-MS-TrafficTypeDiagnostic: DB9PR01MB10170:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LcaX6ZpBPlI7VeRd6xU/SE7PXGTE7ow+3ouAe+bNSWDQFjMEShGTRvkTlp94DsYLaSkhy4F6wnBRHmoPeJ5nFe1/2ZY/SNRBzBjBTjyK3FlSAq6Y+rq97AL63b2/hwtu2MHLLBgNzn+zUawfc4CVaq0v8IwP4KjDviJuxlPt4jsbjISgeBX6oJtZxlhI3CwJkzXmrnUHdKVXdlpeKG0QBuw7mQbfT10eSQAzQXFlMmN8CtzaieVRmirBd0019qu/WoRnN6A6Pax19c1q7Wk0ZrW3MirI70pRvTJZdGVtSOkYlmAlKIBFsbDvYPi6v6eLv+SluuDVu2ytoWfi6tAcwQ38ZAOl1EuF5NTmMG1di+/cI5TO48oel3agcVI0AF5uO1BC1jVtvtn3E4LBjGPOlXFB7a/o9GK+/8dao4cilOF4Hl+xcegIIupI+Rxy+9aksPjDxIFRLN3hWR/xqt0/DH9P/Ybr6zcAAdBi5Yd6klLwXTx/1hB1R3fxaWXMsjW92qWU9sJup0zr2wsUj9kqxg+CrsZVwGkkN3Qd+Ur3thDR6jBXxRhs2gidsKDUi6ui6YPA5dfFn2fvlCS0XQd2NUqpF4p0y9Iyu+9WxgVOA/+PDtF2ZOfp4afrTJAvnnf97K4bKqMABQc+Nfin/VhK37YP/dMHtj/abXF6XxesS7863PJZHtUqSXnsLL2bFUESwYQJho6lTwzpRFZpWP9tqg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zoeCBdg9IBT000kkOi8qU+UL1t0ewfBBPSU+TijoccsXUu2aI0Usce95equ8joS6yftzgKTLwudPqmp+deeTHmXCX3X1AX1hR2yL0Be7Sg//UOwm52rHnoCEdVeOgmQdgmCpv+3xo8Rz+u64rvfq4oL4YYDkW2ljeuoX7gRlh4juW7MWtvnn4BW3XSljCmaaRTQclHVW5N73p/0yft+Z1PhkOiaqJLNtJ4Z1wVLEAX4ITaFLpbOE3zgYBgWJFiLrl2Vly60Z11kt/Dk0T1FG5rVjNWqaAOpsJwIAXoVezS4Nc0Qx5uCJc96eJap0G3l7xOVwM5FpQt+E9DgbVCdtbexoVe0OUjFSkxqLlbzBMCB89EgWPmC0NkIrIolEn4JW5I/T7wf3LXiIeEPOI7SvLtkWtO8VHGVLqUTfWa4QtVNlsUDUzHW9YzcV+xoYL+LhIHTtwNxqx5oIFhUU2xB239DF5AGibo8V86nXTpfdY+HKNocgq9k0S5vc64L40Ze8YRzoa5nL16eK6mC2/jyC632OCDGIn/9Q8CdC5CFB1jZGK9mpwQoJAIQTKJdzoK7jSGmSAKWT8mdv1JM72lvIMB4H7ILe5U/GfKl48LrenFIdxcnHnajMrJmYX48bCf7mbqwIpLpmwEqp8+RnMAgxkq8m2bJvucubxW/79jUVkdbn7D1mYcJQnnAmOteuEgbPs0fTPlQD/AU88zXlJpj6OA5a3vFRbwYHtXYKc1C8ODgBSsNf8NBB9ieE/+S5eaP6SAeQB9wPDHbZBvUkaFoT6siXAahclmfSJxPrullMG388dibkiOTw7HsKkuftNy/3Ij/zwHDk8L8IQFYeW+pEKe9x9WwgIzU0VSEChj4O05l2DUCf33mRBlKzYCAtx8viVA1y4XbEh74Vo/CU2eSZC5NYL7cvpGtTsDnbIG9b70jgfcs32EJhwruJbNTG9ctx3h7X3qW0q0I45fAKmkjuz7Ra/+V89euZGJ6jL0hQ6I+8XLvS7b298nFko1KVAUGo/0GC+skwfRWqH8IRqZVG/fcQlkr/VZHp3qB9jlZO568No5Pdyse1lK8n5URGf7qQLV3SP4zgOI8uXusSozNQQGkQVOhZ6VJ7OI+ljZhXsdQ0jxi9Ws9NU+ONYH3sRse57u+eTdaM5fQ33TVS4jTn4hWV2kZ5ADPbfjNWfXnZdAGYUqTTG/jpiInJZruUa4AIWYFvSFzAQ8XfbehRS/m2wK1bRr+2B3tIK6/1g+N3O0vhLxP4wGhvUjk7bOapXD6svp/cJqmz6d0c3DwkWokXX3+jIPAKPiF7MMD2ruEeFy8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59a2da80-6938-4afa-0faf-08da62ea0b3f X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2022 03:04:19.7521 (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: DB9PR01MB10170 Subject: [FFmpeg-devel] [PATCH 1/4] avformat/asfcrypt: Fix wrong array length in function declaration 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: jYJ5FmOlAJqt multiswap_step() and multiswap_inv_step() both only require six keys; in all current callers, these keys are part of an array of twelve keys, yet in some of these callers the keys given to these functions point to the second half of these twelve keys, so that only six keys are available to these functions. This led to -Wstringop-overread warnings when compiling with GCC 12.1. Fix these by adapting the declaration of these functions. Signed-off-by: Andreas Rheinhardt --- libavformat/asfcrypt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/asfcrypt.c b/libavformat/asfcrypt.c index c77e37503e..ed68fb60ed 100644 --- a/libavformat/asfcrypt.c +++ b/libavformat/asfcrypt.c @@ -73,7 +73,7 @@ static void multiswap_invert_keys(uint32_t keys[12]) keys[i] = inverse(keys[i]); } -static uint32_t multiswap_step(const uint32_t keys[12], uint32_t v) +static uint32_t multiswap_step(const uint32_t keys[6], uint32_t v) { int i; v *= keys[0]; @@ -85,7 +85,7 @@ static uint32_t multiswap_step(const uint32_t keys[12], uint32_t v) return v; } -static uint32_t multiswap_inv_step(const uint32_t keys[12], uint32_t v) +static uint32_t multiswap_inv_step(const uint32_t keys[6], uint32_t v) { int i; v -= keys[5]; From patchwork Mon Jul 11 03:05:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36729 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp1110341pzb; Sun, 10 Jul 2022 20:05:56 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sBQMbHQRWKanINrFH3poBomlTR9X+FS8vltrPMiZ6I2GMSxzKB0Z51Dd3gAj1nYoLzpEeP X-Received: by 2002:a17:906:9beb:b0:72b:4a68:ffdf with SMTP id de43-20020a1709069beb00b0072b4a68ffdfmr5952278ejc.21.1657508756059; Sun, 10 Jul 2022 20:05:56 -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 i10-20020a05640242ca00b0043ad32fcc93si3827324edc.565.2022.07.10.20.05.55; Sun, 10 Jul 2022 20:05:56 -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=mtEf2IZw; 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 E63F468B73D; Mon, 11 Jul 2022 06:05:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072046.outbound.protection.outlook.com [40.92.72.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A6E268A214 for ; Mon, 11 Jul 2022 06:05:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bx0EtTwwhTuCpLnDXOl+WzxdClr8mTfVMQoCPSf+0Tyjj3HcOuRrrCXkO6tfVPjJCcHCyBH7FPBlFdVnyZ+YU+t3tXY/xK0HKSAqTM5X7YHy416nQe5MsXHuy4+3WEf2Ki96nuOU72YBXsG4EryEQV0bkpkfHecIjGyHF2smerIrhFfGHLCkGr+v39yHZ2dyp/I/WpW2ia97rOZxm9FAzY9LUTb+tq81k2KcdB/Tqhd7N8gQ7OlQiJKgE3aQA2GHs2LpfLSCIJej+hb0fl0OSa6gzcuK4pf4OUH0teNZBDuLWnQn0AcooEIVY1qjqbBHu1PF8dRM58P8bItto33yQg== 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=xXTXzAptuvyMypPZBTRH6TRiD6526PrrYIgzhrqeewg=; b=XjPoghvr5XxdOw5f5TzVeqo4cZ/4jjBS2QlrKUe2Hg6njVF4IWAX3sWuQSw9w6XRq9j7w6ntNRdvjTJRVDY8xUp59uIvf0i08xNUZ5+C4ZlYJEPqKtXVduR5PSl2cQeDAGIBk3Hbm/SPfXJs9fPhmGOO5aqc9ZcgJoKfSBjD0ym2FmI2c2jwrMyCBOJG7U6D44svTlL1SDntkj0vuLqMvlhTV0/RE+mu0fFh9Zlo/3XcEdAmxWJVtfSrcxDU2oXWoFsoNvCS4Ykf0RyODn0tIMeYpot5bbhn9IYtRK0Hudjd1jT4sjAkVxc4OG2hl76CjxXXhvyHshm/U2BEZ5U5Hw== 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=xXTXzAptuvyMypPZBTRH6TRiD6526PrrYIgzhrqeewg=; b=mtEf2IZwCcsPirTwt+0Vq8bfdoZ2Qclx84U0Q52mJ6Kji6XzkSOI+yI5XyJrhQA1ZnfRLB/k79LVSDbrg/NMaLq7+BBfQmQs9b+ul2mr18GHvjVThT8ZNPiStauGMmlCnSF4k4Z/BcvvXoZItssy2pqNtoPIVW5XpbVB9aMqEkzi+kCHbdGL5fI4M5KfbOVH6ts+sIykaA68Y9iWcXIs5n8nr4ieXqKcrM1VJpCfwqSyVbKKVdYNY0IAwEtsbokWWE9h0sJhPiC2yloZ6xuH0aHjX8dHiEDlL5SG3x3tJlT06u65lxYWQ2B2jO/GrtCNelxfb2XdnIH6zXcUGpSoxw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM5PR0101MB2467.eurprd01.prod.exchangelabs.com (2603:10a6:203:39::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15; Mon, 11 Jul 2022 03:05:45 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5417.026; Mon, 11 Jul 2022 03:05:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Jul 2022 05:05:36 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [0gMeQQTSke+aPFnLthHp2rrXVdbaqUcM] X-ClientProxiedBy: AM5PR1001CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:206:15::16) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220711030538.3306478-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ebd6cb6f-aa6d-4d79-dfd4-08da62ea3f54 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQpgUKb+VO8j8I+it/2i4oyyEsHysrJKstbANztqb6gTrBjAzlSsK3/H1deuzjv8LVsy9E4fSxkDOhluLwGkG7se6vzWZPsKOZinCFCnJ2e2LTQTCbduLo0m5LHg+No+cUCPLMB+8s4MQlIb32f7HcRxpUps78QOhnlYR2EeKk8AKOBqnGM9luVlE3B/P9W3rhPfLmr+MHXg+WJB2xZF8VB1pI9F0WIRfXNNFr1UojjlYaI60PKFVFz/Vs4RRGoExDrE1rZFCikInWd1tx6qzxaSRf96qEXMnivVsW63Zal35Jt5TLqN4lSmgZA1kmEtjtgk3XnFGxLGVerApmb4oGTxSgGOjjsJA+erYqWJ9+RUlKOfA7Z945wPn+EkctfPAU+uMdKwx8tyjaSn8XT81F+1Dw3qkxyxO65LgKnGJMb4CGKXWXz6+0GNVCeVPaNA9sPxo2rknZBTK9vNhZePZ8u5o4+69ewPChAGU8D0mEWTPkGLomFzVVPMUY7g1PglxAgYKv7C6chFJdo3/45Qq7MuSWKqpkwAU3dFt16WPcMvJ96xQ74jYKlKUaMHAd7NVCRiPBOxpTDDYTkTNA9tew0oXALYeDBppheTYnUoguOQfsEtIDVyqXBrZPkKMxhQJ7nxqbsve8XrID+X5pocGdhLewvC0U1/5i8//Bk3/hTqqOPXugh5cJjM0kjmYtL9JZP/AfQeERjfMJFHgY1NsEogksX9lvkdg0IVM8fP1OSjAo1FOE0/Okejq4NPE5r220= X-MS-TrafficTypeDiagnostic: AM5PR0101MB2467:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2eyaaLG/4OHEbEBUZ1+OVKz1txcjGz6TIdHPM4wIZWCYhqMus6CVLTlipdNUVUFFFs4Tkcyoj+IphxUNspH1HmgMeWZWKZd+MVIJwgmY6EXmErQd8545ADUPxD7hnTmqdqyU3vqO3TCSbyPfa4DnYVf0iii94d0E+xWWDcuV3cPP8mPMsBbERqN/aqDAB3lZpls2bNJH3PesWsXEGzFn2lLu2yelJ2g/Ez1mcH18wA8RUFf8PC/5gD6yLSY1iTZWy2x8bbNBRcyEZocAmNevRUGs0iZTUmJ6/xGqtYC3cMEeCi6SOYJk5dy0IlwKJrSvNYkop95DaNPn9LkogaXTbw4JrsxkJlJDtah/ppKwBNNC4KeT5dKohodpUL5dvrsTNlVHwSXPjctb/R+1jrm25YGcw7w0FSoGfcEadYIbnFm5DfmJKV0XDQ7bmqeegAkSZ+deWJq8SWt8Mny8ntsxNu+nogeX1tfmvEDGzfBLOqT/XACxuCJLwWBMnw4/o+EkIfQpRZWlRopKUhoVeVnGnw6CGqWDl59WZ7WsiBNGWOykpKvnPKARhes6ztzDsll84qgKZTh/nu+ggYcwzZctlhl19h1oyHJq3CAot8+Vq5ybmkJMnmToxDSlnDF45JnPdfC2Lf86n7Qi7zGFrkPCpcX0VThKxcElwdvfd96j8A2Gwnz8lQEYwC8245/9TROu48WTRhyPxVgB4NNUsjrEqw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: e7hpQOlCUDN9+3BhoVFQTO0droOQdbNA/iUUTz+rbN3yu8d/QR/rInFOvaAWt9SwBFCgWSQU8+70PdHPLMNH2oHrPQaoxPCZMkS/V4b2aa8lauU68mm1aLtm7ewkzfzhP7LCUFDijjsDtmLeZVUDorTGnFDqrtPZaPwi/8SAAHO/ATt6RTY6JIbDUhPbZpx6anao9HbzGNJsr4QuJQA2yF1j8zb2jKNjJp4dD61l6I8CIVEGQBab1w4Vg9ApUsNJC58dBimZXZhOricXbVGB5AoC0gCOdnsxVWoPwVl2kt/ltqsVBrt3YViSgymZ7ZEeKsyfzHVafo9yibNAKpwBzw9st8LWYZWZaj8iwuFOX5jF/QDy1QkBNFkOZBzsVBoZWzMxN66zROh+ei89DIQgmk64rmlVvgqSXYp1UniE4PSM8bfvvJpZFvSILgabPIXsvQzF1uLvizE6b3VOSCnq8LXKUqiK+hFpIe8wFYzcxULiMKRHQIt9mix65YjkY9aFyJ/s6QLnAQjo0B83T5JV/9YQsZhrvYt+HQ6ZkdAJCL0VHXGDwqfHVoYN6VoRmrk8hor/Fe2ddrA847q2xu6kwKbNlYNTHmxZU65/yOFnqAPrNnKDj8Q6GCztEO67BtDM6+CDzdeVzI6B8SVsKDFLM2z4yELX/Sw1SRzh1dnIBPyhH9FV72JNYor2aX70HuoNyKtcgV4DHYx9dsz4+EXnOG9ve71EhI3YHCGF6JMQyt4lNFunAwvgnRvqtycPO8DVOlx0OvI7/2FnOhOAH224aBBQ5jrWPuceaa73CkYJIQoDNcchwGihYeLEUURscQ0iAx0v/Fxpm2nHMPDWRF43og1RjLEIWoeCrohIlCpHJ9GpraPljIP58/N9k1jo21os7hx/l2TNnplq9gV+9D4WUumGekRK5svqv4s52ifb9juZ07LBXVW2CUYwAatKFdfCWXznWNOQ1k5hckxOOoQx+KYHiGWbloRixjEkTWmIlnTtxhuAIxSoYeXp4IV+8FJVgCbKFIndVGq50zC6u+XFWXWsgwRQ7maFBLUAB64wcFIoJmzoZmEc1nDEKZMAHBtflDzZ3TQ/zeuij7eRFpn0xa3TAG5SVpaNIUrlBLXTdlWZgh8J+TlCpekTuRmse2DKD0VUnheUDAP2I8S4t8uakwssxo4bbFFjaB/GANiiTocWek81WNjxwdbxLoSkk0J/NM2d+ZmtQ+BQ8HDIwJ3QxZaXLUBCvXtWSNKKw8p9JeuJPAhG5gTtx9fyaj6tIXQMKAtOxdrF6+5cRGgbQY5E8HLmyfUyFqVMMs8Za8zM7So= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ebd6cb6f-aa6d-4d79-dfd4-08da62ea3f54 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2022 03:05:45.3398 (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: AM5PR0101MB2467 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/snowenc: Don't pass int[2] as parameter declared as int[3] 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: w4Cy5g+bWuWz check_block_inter() currently does this when calling check_block(). This leads to a -Wstringop-overflow= warning when compiling with GCC 12.1. Given that the main part of the body of check_block() consists of an "if (intra) { ... } else { ... }" which is true iff check_block() is not called from check_block_inter(), it makes sense to fix this by just inlining check_block() check_block_inter() and turning check_block() into a new check_block_intra() (with the inter parts removed, of course). This should also not make much of a difference for the generated code given that both check_block() as well as check_block_inter() are already marked as av_always_inline, so this commit follows this route to fix the issue. Signed-off-by: Andreas Rheinhardt --- libavcodec/snowenc.c | 64 +++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 24 deletions(-) diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 207948675b..5e6b489c43 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -892,34 +892,23 @@ static int encode_subband(SnowContext *s, SubBand *b, const IDWTELEM *src, const // encode_subband_dzr(s, b, src, parent, stride, orientation); } -static av_always_inline int check_block(SnowContext *s, int mb_x, int mb_y, int p[3], int intra, uint8_t (*obmc_edged)[MB_SIZE * 2], int *best_rd){ +static av_always_inline int check_block_intra(SnowContext *s, int mb_x, int mb_y, int p[3], + uint8_t (*obmc_edged)[MB_SIZE * 2], int *best_rd) +{ const int b_stride= s->b_width << s->block_max_depth; BlockNode *block= &s->block[mb_x + mb_y * b_stride]; BlockNode backup= *block; - unsigned value; - int rd, index; + int rd; av_assert2(mb_x>=0 && mb_y>=0); av_assert2(mb_xcolor[0] = p[0]; - block->color[1] = p[1]; - block->color[2] = p[2]; - block->type |= BLOCK_INTRA; - }else{ - index= (p[0] + 31*p[1]) & (ME_CACHE_SIZE-1); - value= s->me_cache_generation + (p[0]>>10) + (p[1]<<6) + (block->ref<<12); - if(s->me_cache[index] == value) - return 0; - s->me_cache[index]= value; - - block->mx= p[0]; - block->my= p[1]; - block->type &= ~BLOCK_INTRA; - } + block->color[0] = p[0]; + block->color[1] = p[1]; + block->color[2] = p[2]; + block->type |= BLOCK_INTRA; - rd= get_block_rd(s, mb_x, mb_y, 0, obmc_edged) + s->intra_penalty * !!intra; + rd = get_block_rd(s, mb_x, mb_y, 0, obmc_edged) + s->intra_penalty; //FIXME chroma if(rd < *best_rd){ @@ -934,8 +923,35 @@ static av_always_inline int check_block(SnowContext *s, int mb_x, int mb_y, int /* special case for int[2] args we discard afterwards, * fixes compilation problem with gcc 2.95 */ static av_always_inline int check_block_inter(SnowContext *s, int mb_x, int mb_y, int p0, int p1, uint8_t (*obmc_edged)[MB_SIZE * 2], int *best_rd){ - int p[2] = {p0, p1}; - return check_block(s, mb_x, mb_y, p, 0, obmc_edged, best_rd); + const int b_stride = s->b_width << s->block_max_depth; + BlockNode *block = &s->block[mb_x + mb_y * b_stride]; + BlockNode backup = *block; + unsigned value; + int rd, index; + + av_assert2(mb_x >= 0 && mb_y >= 0); + av_assert2(mb_x < b_stride); + + index = (p0 + 31 * p1) & (ME_CACHE_SIZE-1); + value = s->me_cache_generation + (p0 >> 10) + (p1 << 6) + (block->ref << 12); + if (s->me_cache[index] == value) + return 0; + s->me_cache[index] = value; + + block->mx = p0; + block->my = p1; + block->type &= ~BLOCK_INTRA; + + rd = get_block_rd(s, mb_x, mb_y, 0, obmc_edged); + +//FIXME chroma + if (rd < *best_rd) { + *best_rd = rd; + return 1; + } else { + *block = backup; + return 0; + } } static av_always_inline int check_4block_inter(SnowContext *s, int mb_x, int mb_y, int p0, int p1, int ref, int *best_rd){ @@ -1092,7 +1108,7 @@ static void iterative_me(SnowContext *s){ // get previous score (cannot be cached due to OBMC) if(pass > 0 && (block->type&BLOCK_INTRA)){ int color0[3]= {block->color[0], block->color[1], block->color[2]}; - check_block(s, mb_x, mb_y, color0, 1, obmc_edged, &best_rd); + check_block_intra(s, mb_x, mb_y, color0, obmc_edged, &best_rd); }else check_block_inter(s, mb_x, mb_y, block->mx, block->my, obmc_edged, &best_rd); @@ -1150,7 +1166,7 @@ static void iterative_me(SnowContext *s){ } best_rd= ref_rd; *block= ref_b; - check_block(s, mb_x, mb_y, color, 1, obmc_edged, &best_rd); + check_block_intra(s, mb_x, mb_y, color, obmc_edged, &best_rd); //FIXME RD style color selection if(!same_block(block, &backup)){ if(tb ) tb ->type &= ~BLOCK_OPT; From patchwork Mon Jul 11 03:05:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36730 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp1110398pzb; Sun, 10 Jul 2022 20:06:04 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tSP0Oc4uPZXDYJ8Gsq9wlZ4nPA79boZK9LfYbppr7I6NXCI8eU4HBBIb502nKwMdDQ86kK X-Received: by 2002:a05:6402:3593:b0:43a:a259:2518 with SMTP id y19-20020a056402359300b0043aa2592518mr21905887edc.117.1657508763983; Sun, 10 Jul 2022 20:06:03 -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 q21-20020a170906b29500b00722efd22affsi7908078ejz.751.2022.07.10.20.06.03; Sun, 10 Jul 2022 20:06:03 -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="A0/+xFWi"; 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 E2CC068B74D; Mon, 11 Jul 2022 06:05:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072046.outbound.protection.outlook.com [40.92.72.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7690068B657 for ; Mon, 11 Jul 2022 06:05:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LrNnd46RoAud+H0BKwo6rnmNKiN6aKUUE16Sf8HRHKLsJUP5aCkCgBzInq/HdXk2TptsHpMbIsaDM+97Ul2xL4MljmELFN6yR525NdovvaG3dsuZ3+PnVQy6jCS4BSEhakeK1o3Sv6EdYZ+qJo3+bkaaKhNcy7eJatfOPT0QVkXlB6jgsFXBHiPZZnzMaNwxsm5bvSXaQyKsd95PROEgHQUTLYrjejeCiZgfOGaj5QoTux6mmknGP04YwWMUzOww5gVgDObkZ2nGYK/aDVvETcmwDcfOoMKpRoOBpIKvUtDgwOsmhRyUGZTRNCd+G32u9On3fE+pvh/U40tbYho6pQ== 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=ISXnnCf6S5K0DTO4S+WNyMXmA9L3FUqMtPV1HqOHxgU=; b=dLM+TpL+TvjVn20K6yiYJOTRyGyaac21/Eo5VrzJc9Ems93lDMp+GwdLYJ7D+g442Rnu26o9D5jBd6lpLdHspnrBnODfImqQWH7giD6Ue9s95PykoVuWCfAuEFm/N2nKV8XYOJXPaLlh6EZXOitkj4OMo2IQhI0aiIe5GkKQEtLRTql34G29ap0wEy51GnsxjNTubOSvKgPqq8ehGQ8xAYD6DK1DoSywbuoWhw0QAN0OqVMZxayVyOSa/rRUAf6bJeLFndcaBHjh4AsWTmCX3Ac0Hk+166FBhOY80KVJD/5EN1IaNBEJSGy3c3zkX9K+RaBQx4MsaRd239pO6onn7Q== 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=ISXnnCf6S5K0DTO4S+WNyMXmA9L3FUqMtPV1HqOHxgU=; b=A0/+xFWiP8hL9sjGk7MROJJVBo6WBGJpG0YFfU0VaBLF+/5GYeEGB6haBSgC7T11C5zHZycgUmEvEpRm638dODKP5MSXxHXO7Ef/C48NJig/1DEL+xmnYr80UnKr4DtLAHdkgcq2lblyXxqxDXX3HimO9rdaqVJYbTkm/TpL7nTCf39K+c5/aSfcABhb0NWbcI4xGpCEGfLG9WIWzKamvkF6oJfpItOssrP2nVaEd6fF590AMRfeTzRIpaPd6lS0L42VqB6Gcvm22Kj6O4e56oma4p+eaVaqrSpPA7dw7MHx7F0MtSqv/C++wo8smw8XEmln0BB0We2htdywybQwbg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM5PR0101MB2467.eurprd01.prod.exchangelabs.com (2603:10a6:203:39::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15; Mon, 11 Jul 2022 03:05:46 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5417.026; Mon, 11 Jul 2022 03:05:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Jul 2022 05:05:37 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [4xoRjAw/WAyBH2FmIzCLEm58hskwG0u8] X-ClientProxiedBy: AM5PR1001CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:206:15::16) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220711030538.3306478-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4ba4be7b-91aa-4593-bf6f-08da62ea401a X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVlwZi2WejqAf3Basax/LEuB29Sqh7Vbhw2YELGvV8KYc+ZQrGcNtnYwopEXH4NvqTAYe6UHToke0bnnXS9K6A6DJjZSdbsmIeRM/BtHtaW9NG9EUzDYNkMIuC9NAjKRrXr9zhYkGFK+Gji5XdvZIJh9QT4MN0VBzWEyRoGkaXHH4/KKh6lNq5WnGf8wxlA5i1wEsSkbrJGyswAzkGxxyGxuuoyCSpSaoULNxgYdLFrEI0JZfK15qCfDsgYfqOO1bzPPyQIa5hCIGz7FgbjHAYFqoK1MsCHrivB3vSaVS7j1Xi9BfjJjzgB9eaB017Z59U3VQ1Ubh3f+q5GyjJL0aZ3nCQmVaEfOUfZsKMrcT+XS4zZLnbd98aGrkS4W/fGXyoOfxFE0uP2PCQ+nk2sZAGRBDqOaiUAkI/2rZjFCYsj/pIYmh5EHzHUcVoHPVBcOvUdW/Q0mJz6Y6Sk+NX7BHesilmdjXKCBXSNu5mQ8GjKyZCrjTWNBbkftsC9uOmQkJktO6xDCScHcruD4i6wN8fur6ZSqvR8OE4gU7b9N05SiFUEEuqfSpSJpS/gPRHn8cqtj7P/fyZKyvpumauhjxKYIcryKc3VwRIp+ixi5JFWh0Fero0cg9thSuh/qPdhp2IzlPQBlPLwgasPEcofx0zzWsF4iZ6i5uVutuJa/ag/NcP1knJVq6SVs28c3db/BT7l1+A1TLME9fR41MiX7+m3xi1L8evtba0= X-MS-TrafficTypeDiagnostic: AM5PR0101MB2467:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QqzqJBzHWF2pXvmcRvH9PMjmILfob/r2ondhqSqSVuyvHXTIwi8P0LKEfbd8oHh9e1XkCrw4t0rL7sJg/RgdtBOmoReQnVkA4vzClHl0WigwGoa9okM+isUkOlpZO8LybvqkM6mAWfXYh1XKqMT6mWypWc1A7i8UQypoIaBd/RNOl/vlnUtuhNm113Q6S1Xu4aCgexovizuRLiJVTLxj9vv4SnArkPf0w8AGbW/ZfyIJ6FOKzX7uiYcmEznhFpXENLo0RI0FfNFV6zBWhiH0hp9MiYCzBO3HN3L2ZBfLadD4VTUko1NaHdSFbYBD/1c6wNlQG9ISa3OsGG02Z6LHVWSDLpHSqO7EH2T1+FYbAsCVaNe5ecLJ/6dzaWkp9SosngMTTQ3jGveSdBOQZgfC37yBMpYZ4ZdQN07SCnUur07tCoJE3HJQAMZ/n5I1a6UuLuuAO5lhb3qTNd8xkUGZ93Y9kFfvnYmyaf6CWvb9BUk0b+rbyqP+nbwCV2ML/XnIvjO72AuARm0Y0eGo61PwlETw+Zrz3MXf9asHwYzuTdJwJrWHRXqXskVtRwJVGEHm+/Dlm1ymhidKsWw1B6lRu52C7yuNpPf7jCafPJmZFPcT9aqXAm2q9NaQntcx1kngTgEkfa2UdL2ysnBzG0HBvTGduptruCsr1A8SUjH9zq9ll5bEIxn0B9ml0U5y1RPzozQRFLL4SWm8471rA0POQQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gWipcR3CHH4XdPWpwlxfiODSOeSEpEACUyVtHarig6na8MIx3qb8baSZAYOpKxWmFFu3RivBE7aYnkBSWJKgZUBrsF+07pNX1oKPFY4MKTTHKWJkRzffE/C8V6zh+OqGI61/nJOmrtjw60qBU+59GpOR9lUxhEqoywJ/NNlYTLt0687D0rfLEeBTk4nyhQR+uWdr04ydEhW2b0mjvo901QYuCg8M26WDOp1tSSCym/DEXKSzNbey1DxOOhxaGxHMhfCqWRcACyLGhVREbeVEA5KxxWAKj55DRPF83VtMs+sA7llY5AqhHG226YkjeL6+EuUevTzb2WOlsVDV0g7KyQ7qm604SveZE1kbQtI67rAfwfBjd364RpXGgbFT3pjh5GcKuOFYRgJ84KepRKlzzq+y8PxXF63+rNrWVyQpzbvIFzRwOhU1VlZmiiDOhnrKIkMpqdXNhARkd0rfNXwEKVH9PYjWridstsG2TwgmJ1QOcFh58e1qnpuVRrhYIEJy7iZV/WhA3ds66MrmIW0S6qsNGIS/A70Me+ZbLT8/qjXJgjXunce/aYK1IiNYfEJ42Oj8uWg7chcw0CNUP5lAUpaQh+bQuKgz9m8hblGXXnapadN16OM/v2NHzA55tzYwUnAL7W9g+65tZSxjrN4cY82qyc1lUrBHvCykAwzFZWvWCgGgkrNoMbbBsYhVjITX/pB2p6L8l7ejjyqNnCTQflahtib73ztiXwOvosZAzs8B0J+LaOUwBV2Eprtyu/syKQoz+E2QUsQfwGTAnmTRrO/saOPG6SHG0feRjAdETwxkdlEjd5HAUNtXVKX75M3QmN+K7kjVMk+Rg1yRRlUpFOru5/Ob3cQinaZ4y/QbzRQl0EjltV+jwcyAjykqjzRoD4gi4dM8Z/kIUXJ1hs3cs1o6vB65nlGH5UaebPl2ALLCK+RoT1u2zTradC2PSOzP7OWezmz90878g0VNnd5gwOApSBtZTOu1nD9dgjr7UQ9CwYh7YVk0Ep2JM3GIl50ArvN6M0Bs+2icer3j6+EwDrPfAfuBe5I+mJOYuj19j+QiM0WGzwGbP4aF13h1TzJhuxOCZgGMy0LGcNf59pR8Fm1HKW4TmEx4u/8La24iDi1gGIf2u0wmhxRjeOVDe4VRpKccQE5xzAi0eE3D+HViyOHXiOFl6f0iwp3r+BwnaWIXrAuiPP70fybdOB5nZ7o3hok7piqzv6OCdSUD0pshDYwlx+dh3z9KyhPt/JChqNevxJeihC0rkGXOvgQX2bMmzM5ykL/VoBQju3hUwVtYRN0M9mHDZ8mI6xUMjjm+708= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ba4be7b-91aa-4593-bf6f-08da62ea401a X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2022 03:05:46.6366 (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: AM5PR0101MB2467 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/h264_loopfilter: Fix incorrect function parameter array size 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: +AkqRqUlES7W filter_mb_mbaff_edgev() and filter_mb_mbaff_edgecv() have a function parameter whose expected size depends upon another parameter: It is 2 * bsi + 1 (with bsi always being 1 or 2). This array is declared as const int16_t[7], yet some of the callers with bsi == 1 call it with only an const int16_t[4] available. This leads to -Wstringop-overread warnings from GCC 12.1. This commit fixes these by replacing [7] with [/* 2 * bsi + 1 */], so that the expected range and its dependence on bsi is immediately visible. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_loopfilter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c index 2440cfa831..c164a289b7 100644 --- a/libavcodec/h264_loopfilter.c +++ b/libavcodec/h264_loopfilter.c @@ -143,7 +143,7 @@ static av_always_inline void filter_mb_edgecv(uint8_t *pix, int stride, static av_always_inline void filter_mb_mbaff_edgev(const H264Context *h, uint8_t *pix, int stride, - const int16_t bS[7], int bsi, + const int16_t bS[ /* 1 + 2 * bsi */ ], int bsi, int qp, int a, int b, int intra) { @@ -166,7 +166,7 @@ static av_always_inline void filter_mb_mbaff_edgev(const H264Context *h, uint8_t static av_always_inline void filter_mb_mbaff_edgecv(const H264Context *h, uint8_t *pix, int stride, - const int16_t bS[7], + const int16_t bS[ /* 1 + 2 * bsi */ ], int bsi, int qp, int a, int b, int intra) { From patchwork Mon Jul 11 03:05:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36731 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp1110446pzb; Sun, 10 Jul 2022 20:06:12 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ufFj2yu5IBVXXXy/uqKXWHfc624L0aftXacKboD8kKtprh0nKT1GBaG6PGkL3TfeDnOKXz X-Received: by 2002:a17:907:2889:b0:72b:50c8:c703 with SMTP id em9-20020a170907288900b0072b50c8c703mr3954630ejc.694.1657508772142; Sun, 10 Jul 2022 20:06:12 -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 q17-20020a170906145100b00711efd98320si8089057ejc.241.2022.07.10.20.06.11; Sun, 10 Jul 2022 20:06:12 -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=DR87umyj; 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 18B6668B6F6; Mon, 11 Jul 2022 06:06:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072046.outbound.protection.outlook.com [40.92.72.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94DF268B72C for ; Mon, 11 Jul 2022 06:05:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QbSM1Gm4XlMU1DF8bu+a74aV/f6h76Xp1fkX8fbfgZ2J252nfgkbG53vMPUeTORyJEJA5Droizr2bKHZZ79Xhd3ZVK8pH10b+bIOGetXoyKHC7VaXc6tqafnDgPnxDKiYOvYyaT75xANJKfQ6J4rUbeCdSnV8qzuHvQYvwrB8Xz4ZSLMfOqbI8xEp7mLTph4RXU3no2aABKwOz2gIzA/YhYzDNSRo4NUC9+C57L35fxCIaSn6J49er0TvX0L7HDFifIUxWqVMH1MGhqaMuhhI6CSRysfb0LP2PlsXoSS4FclPQNe3lmkwG11Guyq/ZqoKMCDeOzRmjmOEkWX+AGArw== 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=bOSZHt9eTTSQ+tHpE7cAld63H3LZN6WPd+WzXgKEIbc=; b=F/FA6/2eOsc5RqirIxV/0KymUDcfZSKY439zWQaVXeXX0ZmufrbNulxM3YKEsqbQHRj8/tPasTMThXQwjzCWx0vK9PDh6Gi2jMk2YR+kx3XGrhYEjvsqzHJ//GZKYOEC9vdBf5EUJucGTMgvBnjZnwjB3tDkbOxqIVHIIAH2L+C2YOO17nc7HnXbZ7OjiPlOtM2bu5tb7syZ/cQC7PdKGF+c155nYnnOybOAHZ9pcFTcADEZzcDWAH98Z+XS9hKJEDMXFrQCQ6Fo3Vsr/2BjHUOM0nSkd443azhYiMP7cqxzEuCeWn25uU62zYxmAdw2sOY3oJNS1UbAwLE5R+MRJw== 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=bOSZHt9eTTSQ+tHpE7cAld63H3LZN6WPd+WzXgKEIbc=; b=DR87umyjeq8Jic/tRdmk/U/uGJUdg6RmVrr4KZ/Ck+qceyC5JnLK3cNsatKE+tp/kOLD4wxVWZGAL21jT6NJyoypQXie+V7t6G6GlpEOBR+GPV2EA0ETJW/Y7xfYwGe3hI/5JiYR0dXoVVMtDSVreB07qGsgiFeUitixv72QAjsu818JHuPVGMMfubTJw5jMSOkJkGpH/G+rxHMjHF3FdvTJqUmy7wX2m0ILJ+RzGMOkdiPMmNFeJHUnPf178TXcoi2is8D2eo1HNQhZNnvNrf+edk5UjyfS1GfLtTEnrbqpio3LpxBXDHINLf5SmBk185RwGz2ogh3kHPjV+QuG7g== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM5PR0101MB2467.eurprd01.prod.exchangelabs.com (2603:10a6:203:39::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15; Mon, 11 Jul 2022 03:05:47 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5417.026; Mon, 11 Jul 2022 03:05:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Jul 2022 05:05:38 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [YfNyExslZRbustES59Jdyed1Uqn0HJwg] X-ClientProxiedBy: AM5PR1001CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:206:15::16) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220711030538.3306478-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b11b00cb-388d-4b51-3ebb-08da62ea40bf X-MS-Exchange-SLBlob-MailProps: ZTmCor6bjd/SexwgAHrvelkT1ExecFBRsuI8noGbti8a7TasaVg+SwlI1DmDA6YusO/CU3kW5b8mHVma6cylU5p1LTHvFdo33lOIV9jFjzaWjSiPq9VOjof8IX67rF/iUskfogwbAlgea0abCr1pjwEyGK1Vpve3fAxQOw8up/uRje4OIIvor/To0yl9fDGPkL9syR35jbxguRLq5YbWhIl6XfSRB+T21RrzmWl4F6N6LGRQV22UedB0K+0ldk3y9QamKlxWDSuEkQtuBwp/hOcrRI2blIHeE2d5cr+HbZ8b39YN20VmjP/2TwXyiwJZ8+NRcF+DHWfXYgyQiyUq6m/ehmbSZtw3KIjyZlxwsUk6oaC5XbsmQuRTJYjMRxmX2VpkLTHA1hHvI7CL8wgXFhQ6b0V4s7/nmg8DETAqqNlS9JTk1Rjcm5eCY/+dHIBPFx69O9X7nyVjZdHtL8dnd5OLr9VG4zr8/zfZ0QZh6FLz8w6kvmsGvgx89Qv7coJboQHKbbS00Pw04NTple1MOjBp4HDLI/Iak3F5bfxSR2Hy/lTPEg9SEdPC7Co0O9jReNoOrdYGrHzl9lV04eyD9KWbNLt5yTYZclk4ICpPQw2xj0g6W2nwlVxe5OdgNlxhSKD73J7mGyb9rXkC4eFNv/SD/HltlI12Keh4Y7Rl0Qf9C05X6UoKnZ85ae6xYGFnla72/dHFFtHfvMFKSetjvSnn0XKgXPIYhSPqC8HR+062P7qTge0mUzQgByoqy6JyI3NvBkW5RYpgFDy88RpiOBFk9EpeGFer5r8bFMxciP+V/8aDKFkdJgTCM5V8bD4C X-MS-TrafficTypeDiagnostic: AM5PR0101MB2467:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bXjCK53f6ObgC5NazXf1EC9dOxjLHO0BVulCkPVAzT0l2Grib7q+Lj8aiz6ss0Jl2WyMm2EdOorH/AH6iu7sWOT5R7fmusvHWGW5fco4XdjhKmhHtgUnwOUKLUJ324/R6QX00nC97BHnZCUP9vjLbmYbn4ILk5jP5ld1liwd5aVSIz2PGaPVEOB7x50tZYjnmguX3UIeH5zSj6NIaKbtZSZh/+CBOuR+kfg+qIpup92ZN4O19a3REjSRgCjSuEVRUSUBBd1w2YU1vmA4/bR5RStJ1qTq8RwC1NxUWyDvWPutmI4YA6zBm9d6oovl+OnGxXdoKMxBhM+L5bT2C5euuUIguuKlNE9alE1DRi1XYHhgMmlop/Gu5ce2k/JK0rhxlPP4m7OrpExUvJuATXehPONhz+lEKsdCDsKqXcHIwlquicVydL0DFU5miPE5CJqk3auaTCRqBFDHhVWYHnIdazs5JfOwRSAD13tCqoAm3F0km1P7MWzHZ+wDqbOgl/pOYbDeMqwJcPmXuklX+wOmyYcBY7dogB85JGwqFNdBVvwDCegOWWAQpxaD0DjHBynXAw4aeRhvSx/wNJOvFexoDUwWibcRJSAnA5IXz0rGBWGAovoTKyTm8kWCLdSVk7leZEueQ2CbVSysMWRJZD9Yysvx8PmSyz/7Qrq1lWjumW31l1/9XNnMKKqcTbB54scQ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jmHRNx2qIarG47dmtK68s91w7KnPBmG/DN5m4ZoXv0Ca8GLbAj2R+k6wU7a8KZcdyI/78YXBeM1BK8xwVhrqzhV3fRQ87kawphjOzWKdlqmEBQ+C+RXIdjEkAA9jUsSpkqGdikTFiR98BS33EKmfAaHcv+pkeK/0QiDajv5Rbs9ko3jpiDstlVrHhAzvU3ndtQuxDogNidXuhBSVxV7aMMwIyDVR40MY47PG0mhWsL6YDZN2cpYEkbTeCRy6nJ9Q8z6euDQ9mrBER2SBfeMwjpdn2qLkUatiPwkpz0aogZSIDiZk2pD7B6wCpqyk4qRmHJysmXV4SZ9i1JV/PkhjKbE5OBaKBXQga3bYVaTE0NjX/46BTT7xXum9wRJMGWC0wKUe6jqfdNZGSZALQeuqnsKOrZcOsXXr58sjfIywv9kwENvRN//7lx7n3f5Kkhcv0iFwj4wBtt/I8cuiOf1I+8d79cTa3PBQRhkNlj8LEPvl1A71T/93ymPEdBDQ3tIyJH9wga/VLuLOygYtY/wa5BUlGeiW7TRuv5zlwAL15mQ9iYXIU9uJOrL9K+S14+jksB+G29j5OJc9YUMrLdR72Pw2uyshJeYzj3fHdFGd3veJWQ9GOyPNacU04PLzO52n4zf94l0hpDwqdIYvn1hQK+xpaVuK/oN5V2A3d5tVsuROPPsu5coVV5uTVoTfEs2HvnIdl0o3Wzxunjr8rFaJcUAeZ6nfeO1ZDhheYbsdb3R/xJbwX0wHIfgfuuoYHNBklieHApxGwo8PBUeIiaX0+gFFglTjl8v63sfSfzRnY7foOkIwQ2h3N4fqRTUtRhbfiY5jlN4rONusH12u8OyndGsSetnJELtjE/XJZKDfze3A8UfiO9L6U9QjqhxAzF8tZD5MIdw1phLsilctcHQe4bJuEUxZ3lLxQun45NoYUcVzczqErCWaKUl/VIty0O0P14sxS7vWfIcX4+rcgJZhFJjoIdsVYsAlcSx5F8hJDFrn0ApftJGrpGXe98PXexcWtkPtj8q2GwknZ92oafFr4oQa9U97cKuqM+uXL2EV3vn8U6kGH6fxnV2ej99cCa7CPBbKPxPCBG2wHls8WQsux4om7N+k1Ds7QymcGQbpOEpGeLKOgzc+qypTvFH0YSPWuMBBEgjbzPAzrnhbi0j4v7sCJ00ffeKMkzCAKY4jADQ+t65CB8TnTIlHzFY8iO59Z0ZZmU/TPjkF/yxpwANtsJgHZaPb5ZZw0eVaxRkKDm5GcyZeKfqgQFdKzkLpmK3xTd1uhoBmLhJbMk8O5k8VAxCRQEBMGnrykFfBYk37S5A= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b11b00cb-388d-4b51-3ebb-08da62ea40bf X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2022 03:05:47.7303 (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: AM5PR0101MB2467 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/svq1enc: Use unsigned for parameter >= 0 to workaround GCC bug 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: uYk3lh6maMH5 encode_block() in svq1enc.c looks like the following: static int encode_block(int block[7][256], int level) { int best_score = 0; for (unsigned x = 0; x < level; x++) { int v = block[1][x]; block[level][x] = 0; best_score += v * v; } if (level > 0 && best_score > 64) { int score = 0; score += encode_block(block, level - 1); score += encode_block(block, level - 1); if (score < best_score) { best_score = score; } } return best_score; } When called from outside of encode_block(), it is always called with level == 5. This triggers a bug [1] in GCC: On -O3, it creates eight clones of encode_block with different values of level inlined into it. The clones with negative values are of course useless*, but they also lead to -Warray-bounds warnings, because they access block[-1]. This has been mitigated in GCC 12: It no longer creates clones for parameters that it knows are impossible. Somehow switching levels to unsigned makes GCC know this. Therefore this commit does this. (For GCC 11, this changes the warning to "array subscript 4294967295 is above array bounds" from "array subscript -1 is below array bounds".) [1]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102513 *: These clones can actually be discarded when compiling with -ffunction-sections. Signed-off-by: Andreas Rheinhardt --- libavcodec/svq1enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index 3c2d594632..6072f8d07d 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -91,7 +91,7 @@ static int ssd_int8_vs_int16_c(const int8_t *pix1, const int16_t *pix2, } static int encode_block(SVQ1EncContext *s, uint8_t *src, uint8_t *ref, - uint8_t *decoded, int stride, int level, + uint8_t *decoded, int stride, unsigned level, int threshold, int lambda, int intra) { int count, y, x, i, j, split, best_mean, best_score, best_count;