From patchwork Mon Oct 10 03:13: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: 38647 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp165984pzb; Sun, 9 Oct 2022 20:14:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7QLNLYcPhVttTFn+B7fyRklr99nKCp1zSR4M5sArho0VNfdADlIucYzvbdRiozLmTtxyEe X-Received: by 2002:a17:907:7621:b0:741:6656:bd14 with SMTP id jy1-20020a170907762100b007416656bd14mr12975570ejc.298.1665371697378; Sun, 09 Oct 2022 20:14:57 -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 q22-20020a50c356000000b00458bb34ee93si8457298edb.149.2022.10.09.20.14.57; Sun, 09 Oct 2022 20:14:57 -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=n4Imv9ds; 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 3A6C768BCD1; Mon, 10 Oct 2022 06:14:29 +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-am6eur05olkn2035.outbound.protection.outlook.com [40.92.91.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4109068BCCB for ; Mon, 10 Oct 2022 06:14:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HYqbpmcafxmskCVMm0B6N2ciEEliOhNArqA61eJbJq80E4OBGfrqHYz23CrdVij9ERTwmY2180VmPst2hGCb06vosFZELO+m5uhNCu2VB2CDAuVi8vep7N4xewmIIfwlQdaB2piRVdrnwt9pEJsrVjojSVZFcDVvTsDcnI0I8TIkIFtdDaI4DpRqr/AXaMKBdUTJlIIOZQ2DFGTQDcZ0FGw3eNgFXtXOT/Cuw1gTXhQeXS7fP7U53xpWtKxndu4hIp2DIbG+mdSWJxURcBxksDQTcF6bQ9g69CNP1Ob5phM4ZkCDAJnijmBooMaqD0fRFH70Qy4rGALTH08sRTegXw== 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=5u7xBNkRdyUHjYQDWbr8/N1jyXvcaZ6EZEjN/G3hdqw=; b=Y4a3J9fpU9DO09raWaUT0ngVC2H0hw1dWXIZEDfbdxccnqOjmIgZbByq6CzDASrNr7BpI6okANPg4DPGD8sS7XbvwIhl3RFhP/k3YRi0JfDP7LOioMnROJsfFD8CZfNrY8X8tLMrTzq4VaSKM8pgZkJ243rmyvSJQu8W5eEJl1p5hUxgPRLV1PjHTqzs29rMkBRlS7pnvFecpmh9DrL3kV/87DuKyfqGIT+q+3i2lAda5y4Xh7eH4r2ntDBHd8dzciKkolAV5+BHlbc97Nws+VIoXBObbvyN018wwgjLENFr2Qbp71M0f8/FLrxqusb5BStwxq7lq8S7stQG8YsGJA== 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=5u7xBNkRdyUHjYQDWbr8/N1jyXvcaZ6EZEjN/G3hdqw=; b=n4Imv9dsZeRROybmP+JmyUnDetgUzIv9gz+e01yzVXaeRnamPhNa23j4NwseaXUSgAqkn9XSgmfq8signXKo0MyNurCZhbhFXKVXyFFv8WKk5eQu9Bs1R8AjHENAlOZrwtQcYuIKeNYNPvuA7E4Q7g5jxPhjADc46RFdpWRYWi/w+COgr/4/10MJe/3aT7ofMjAzSV2Y/V6+rRLWtwnodL0z4D2O+WfjdtN1Ze/LFyF0VKbovzB2nGdQGx5EcfizPpvQBe9rrhDIsYXMtgcCL/+V7JxFstzPM02Kg5oQYkdWGFgPW9vccHQdCTQ05CpEnun5ePOcDJ+BZtaQiOKuMA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0354.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.32; Mon, 10 Oct 2022 03:14:26 +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; Mon, 10 Oct 2022 03:14:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:13:09 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [yTYVfa0kJHhH02EqMMGexZ7NO+xhzqtJznbs+kPhRFY=] X-ClientProxiedBy: AM5P194CA0008.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221010031310.187429-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0354:EE_ X-MS-Office365-Filtering-Correlation-Id: 1249e811-8b73-4fb4-a9ff-08daaa6d89c0 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFVxtZUJ43WkHUqXHb3bKxQxtw1VCEJ981+jcN1R/qLq8MIDsD754SQs8AEe7BL3gSRNmVzgP07N/phF0mDoQZPPeet+rd+LcccmXV1eixppU692mESUjNx3kZa1gzEv/Yjq6X/PQQcbcrhFwtWYb2c9U2brDnTEGIM+GT4lBd/rUsEKSwbFDcmS1BhGlpU5DlxmsPzLuscABctn/b+lBT9s5TUGJK9wwyGa/GKxzGLfotyg7lR5kOtU/q80mI98tn4uq+4mokBcbVS9HM13zQazNDWsBagMAD8UowE3peFDSlhT+7i3hPZ3mFU8wic7LXg4aig95mW1rXqYCdQWOKbzY7SIkQn/3fccy+0/583p1ecpYPS7e0IknUZ6bXEpu/utobtaTGzseYVz9x7/60AVX8Gstaa3J9HzNfo0uDdZYliESfeFHyXy9wLEpuC/yyLjbm+9eF0rc0UQ66ycRTIFFG3qWiAq4w3JrGK47v2+MLbTUr7g2jQ9mz+HOt/DR7XqNYc7nktkWQ3kYN88UkNn9f6Sb5qxE6PAo02hQtqHLDb0jqp3/AHxV3tzmcpH47SIMIX/6vhJf219oASyh0dpgkCnJBId8nP/Ay5UA/K4orjuA4yIEjOd9m/XIf05M9u//8cfUKqFItzItHuc95m51x3v/urrdvJqzSxpJgkh+pSzez7qslpJ/Q4OUC47I1yRCzyoPGTkroSbkmCpoI1E5GGq4FZakNHxGWKSUWt/iaojlhS/lVq0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pFbV2fy8KmcOMeOt8dCJFoKprbCw26snaOKmRIum2PIE4XEDbyviJqhrltPvC3oR5hFRZFIsYHkZxHRPacT4knVQTuGW7aQ+k+fIMvEcX9ImA/eh3B9KJZ8v7prKUgbB/q7thfiG5OEmnVep0upoTNJdWVQ1P0BotJg/T1plIxuWPODbBYS4ECUnenB+0wnli0LDA1tiehtDgJ436c80YDU9EL9pjnrptaBZz2+xbWDSI8zldJQhJ22xBUQh5KurMooPqxJ5x4yHNhV0Fsph+fWe3TOJnsPHA7czmruFJsNIvpxuMS0K6GGY1JtTTLNitr97Yc1+JoeiIISCYZyPyrCwJW++/qjStQCdCG3SVsNl9+rVH/5OjddHwPK8ASEfhcFZoim/RvrdhbGsIr50C7b25e7Z9tTSzfgoxpwPvuu9m/vVI5CMtgcLOcgAqFjxOY553VPmzwfhe6lkjOrXx9dgnqKQSltCLV3/6Y5lUsTm6KVAlMjDyOkW6uE5Hu42h0n8W0iHHOAMyEkUJ/crMhUDFXcR449VpUlJH8bDCcD4eL/28o+52g4IMsrPUG5XEzlCIv6rPrwhqz/PnfzIirS1FHNKfG1G8at+L21ZZ26gcJ+p6aAC80x8gCaCIsd/sSvwPwvT2M5dyATBi6S1f3hM8nrWeQoOf9UaBAA0X5sVPO+o5ls1RHcIYHRL6iho X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tbS2OEuuivaD/hrdfYvTifN/k5Qtt6uEjuQ64HYUNTlAXntkBKSJbc8Y5MtgnLcNtco4dO4UafFdAK+fOORFDbx1dhvaan5qOiJ9xMYuFrEQZQO0aTEv8U42XDAutIOAxqOHgNzpGkWHPQFmsMCgRVkXEKukzssplo0bY2Mh09r7wxa2kVRfAIYDbesMetV7lSq0kTicatGZr0gb8wN7OhehY0NSLPsXXJzvUNkiKM3ctkO4VSgblYaRtb7cO7IKBPf2+qrpWI9hblHaLi0iDGHv/VBjt4CT0RHV6CkZnGF9HcoFka1kpAX5pwoRQEVEju0xxpdaM+QyReZAiq5llUN1eEmHw09hJGyIbMppwuTY0xVn+8B0UZfgSRWrcpTTjvEskN0Hc9F13BskwAGbNoIZrCWU1MhoO92+voecvYvaz32ERMfJswi8S783EXcgZFrVgbM1ljlqYg0a1L+bXJG9BG3UmVZ2pkGBMAuiC/jmj2aVK21LIeqLIzjhxAKnyLU9BcPV9el4QCSyE1wyNgqfo2I1WaLG9lx10Lb00Rq2bSqawzXDpomM2jcEKtgsCyIwSTGoqa8nCLC9j90ST3My9b3Qx2u7TAq03+eHsKyF3D72gIHH2HlEQJzIUpxp2fvY6BCf699u69bUVPMNOGNuII6zhIRkVJG95qQ7/TpQFzCqcwyoVbEt1LslKaI9sAKfwYIOe7ITOzrMaqpjv63LbyRhIARITKMWp3J89N9Tu/zmnd1c1y9qi0CjDzihn/e+mL1mGsKak2TrO9QbtNFRID7VLYlVN8Z3plJmkAalD4JGt5oULlLH5Fy+uaAbKOejj1a4Opdc+vLF1STLDwIsUd7lplLVoeONDM11CFVFgt2G8CoNrsdiZPw/ua2Wv2ZX0iDN34QSg0Gm3Lly4uq+9iI4yGoN2tTmDYGDXzFYl26ls+q0RH+axCdyuBPIWBV1k7HYNLD/U5fZGkkDA52peIY/xzlcGtJLR6XH985iH2XmAgy3p1OCI+bGK24fnlpr81gWmqyPDRZOP4+ZSCn1WhxWrAk1d9gQ9aMcuDqmxnZJiYlwmJm/WBbpxT9uqfIeHEV6iQfGz0mqMsj5R7/7l2hM56+xzMhBS+lX9Z5WqnKnjvLkw5gGSx/REeQpFEXqvHCEyKXiJgMffz5znOsbpc4YeXVWdX3V/DNMntBejh2r365CQq9zCQuM6ZyfNj5MZcxQliShxoo0skkcF1E/2zSnYeiPtoLljiH0o/yVZ/zZsYrXJvTG+iW9oDOqE9zzxPdYq0kvKVGMLoy/4hzsR21S+QYxVGKpZTRG4d8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1249e811-8b73-4fb4-a9ff-08daaa6d89c0 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 03:14:26.7483 (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: PR3P250MB0354 Subject: [FFmpeg-devel] [PATCH 19/20] avcodec/snow: Reindent after previous commit 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: 97dm66fLW3ks Signed-off-by: Andreas Rheinhardt --- libavcodec/snow.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 52ab39bfd4..ca43550f20 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -539,12 +539,12 @@ int ff_snow_common_init_after_header(AVCodecContext *avctx) { if (s->spatial_dwt_buffer) { /* Equivalently: if s is encoder */ b->buf = s->spatial_dwt_buffer + offset; } else { - //FIXME avoid this realloc - av_freep(&b->x_coeff); - b->x_coeff = av_calloc((b->width + 1) * b->height + 1, - sizeof(*b->x_coeff)); - if (!b->x_coeff) - return AVERROR(ENOMEM); + //FIXME avoid this realloc + av_freep(&b->x_coeff); + b->x_coeff = av_calloc((b->width + 1) * b->height + 1, + sizeof(*b->x_coeff)); + if (!b->x_coeff) + return AVERROR(ENOMEM); } } w= (w+1)>>1;