From patchwork Wed Sep 28 16:35:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38445 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp358129pzh; Wed, 28 Sep 2022 09:36:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6BuSJLzFWo0MRpWqcPtKscvnZPsNDD1ILqsolQeqReRhBvbYiLp8DSWQxCzFPXCGHPhHss X-Received: by 2002:a17:907:1dcc:b0:77a:c5f3:708b with SMTP id og12-20020a1709071dcc00b0077ac5f3708bmr28434199ejc.331.1664382990525; Wed, 28 Sep 2022 09:36:30 -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 r13-20020a50aacd000000b0044f00017470si4908047edc.634.2022.09.28.09.36.30; Wed, 28 Sep 2022 09:36:30 -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=kX3oM5oH; 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 931A568BBD9; Wed, 28 Sep 2022 19:36:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2014.outbound.protection.outlook.com [40.92.89.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E60B68BBB5 for ; Wed, 28 Sep 2022 19:36:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KzgZAzJ3buOaHkypZh6BuQOVnNSdK8FDuxS2F7gQP3V/K4ay4xXbS84HqqHzOon2Va09OmMfIwCOPlql449C2fD/OaLOi2Ad7qJkjJ6uTBmitRFW+zyw0FQhRsChm5l7FQdxUUV8mEdi5B6TxffkqzklgV69L35LDguDtS81C4SC1nVr8GuK4328D4wzak0Mnonz2zYGLyOTmDImK0jGSHiJBmEJtvc981TaRTTSEXmsaKb5egxY8N7NMNvzWZmL82oi5yWCRhXhZAHch3enQmTIoMdPj7rZrS8sySTl05mPGZg7Js5PqWwAiQS/vDeXfql45KKn8WFI02fWmYQkTA== 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=9MDadMv1BUFxyGoz+a/32L/uRVPnzRriW9p5jcTGW98=; b=eR76wc0o6lUfJg6mb3r8sIjArx7UCqeVHIjC8jxx5FdSWc8p9olU7RORg6RkHtvni0O7lcZibFFMPUms0Qh4w1eTWsFO3eM2zOEZUvtSWuzVt+E0dFVSx3lBLMcodfpKa6v1tagE4ROtw/dclij4fXGgpU3Nkz8X3I4scxRfr8RhF0kHVHOzbiMBwJjeVMXHzXPLucYfC7u1gmhDSo6jpbfO+uEYFhx3tYsY/BYJIGD6Y8atV4Rd3s0vRzkS5KllslDGC0UVY12DpXa48DABAu3AlleAcMdnlQO1Rsps80NbP0IVCaZs9lYdg9K2T872Mqt/5E9S2ri46XtC+e5giw== 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=9MDadMv1BUFxyGoz+a/32L/uRVPnzRriW9p5jcTGW98=; b=kX3oM5oHokdo07VVmhJttofkHzo62G2reWD5yOvUfJC0Nzg7ETDvKdM/bPTlkED5/1gUb0J/AAYlr1dJl4X3yr2xfBPza8khRq+mUD6S4z18x22DakG+bq1OPDndgMUqqPgf5Tur2cPNOazph2dT2Bjc61zhOcpIsVLVAXc+5x3I+lbifHCHSleaUgKowfAluR0BejXPIz8mdhch4ZvbUtwYEQrDLNoKwr5ktcOJaZPIglEYWXfg6I5GuB4gdD6dZw1rLq7Mke1Xm/LbFtMj9Ou4FNf/UlirOOGbAf3Eq2Blm1prhn1KKrsv6RIMeAaowvrIsn5ppJoZAYzZDXgOiQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0006.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:359::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.15; Wed, 28 Sep 2022 16:36:16 +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 16:36:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Sep 2022 18:35:50 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [etIG751VfEiBsTVvOPXjWza5FyDu3UrEJSw3I/C+ins=] X-ClientProxiedBy: ZRAP278CA0009.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::19) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220928163550.916073-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0006:EE_ X-MS-Office365-Filtering-Correlation-Id: 5b5ae534-4cca-4a17-2341-08daa16f9099 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKyaZg3Nqsb2Hykb5+EITt3rfGZ8I10FlYg4NzdvC6Gwlow3L0B8vcefPu+8JZO74rHMSL19T0vQo5HnPqDR7P0C5yGbC6UEpQdkbA7NvT3mccvitzyDPehaKPhB1Pe9sLvJeU4zsAe2qscOl/a6tg3P2QCNajnA/8EAoqcDfRF4yFajztVfNUJCHqPBlP3VSAedHxhGgm9NbUs15vS2YdBpltGSeCphBWL5nNGTL4LdMS9UGcLpgFFy8yxjXcTpD4YWAxE+6HjDspwbREVMzVWKb7G3nJo92wSzVo5lMUAVKFciT9YtxDY50YRS6HGHbCOdF1XEvON+n1VwSS8od6FY+G/HN7OOTGI0IJn4UvdVqTd1WRbAulomHY6xkOdzEGV9Zk8fknt0bbsT28DLyVusGJdNwWpoVvTT1LU/fbAHAnVXxllUuLxPf/CxfaET3C/hHc+B7IXh379v4NamSHi3sAO+UFkZ/RuGbP6TETgq/9JKxkwl9GR+pIODt3vC0XSxqW6Gcmv71LkGx7xj7KWTzQkg1V8VUfripyr3k6QsbDDnIqanYyk2HWGmwY7oNFiQrolqhTEEOln1sQow7Y64ry1cZd01hk5jG7z5KO3mlU6pdZGWxS226qH3fxwNJTBAuPeTRu1gd7g24izySu9XT7m6nW81+3NTeZbXSVqISvaGLSviHHcMh0DBAh21C7NWaZkrgUkgScfCMbAJg1+1h+wyMgv5Sgo= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ITZBCqgxg/8FMmFNgCmvxXFn4mw7VtV5+7uUX5OsBzsftOE3WK2Upnthnbd1VzMohRXPPFxrz6VSontAyHAk/UkbFC+C6hQqXdIHm0tdlqY8GoBg/gELewpqArYJD76+5WM13BQgwBJTYR64gfpC5QJyK2rfK5jI7cfr17OcYQ0GPrdlg9CENaWYFJ1UAgQhHaI44nrr5b7oJsTKS/E+5qlNRQKNPHurjsuJJJXvvKhj45qdQ7NK3HH1Z8kViEMVQsCGb1/G3Yc2zLn/ZP13w5irVIKzki7YJ3bgjfdeHIGseUwUEtJDHWZHFB+Ez476sqWtS6GC0NMZ0vNptHcjd7BkHrxJMugVN2R7XCcPqqf/1+EkUsgkC8K5q2IOlpB+kZQTWy8o/BbTHf4bCd6ODol1guvdbWZSNG9MsTZ937+glHdhYYjuTGMwghuJU/d8tbr6JsYH2jEDI5XTYKpRTIPsKEcJfitlKB/JIPpJFL9Qrr9wG5BZk0RrKkiz3M0bjXQe8o2i+fU/P+0pAs2BNXlwj7rPOh9lyDBkOWVKvbnH1WXFkMGLBKj8Nm+qwT/MJF3EOjOkcuNVsVxUc0FZXpueUbdE9J7Fwi2mzugLROvIctQoEmqrlq6dndQGjwHnaJbCS+yiylzI9PhnoCJGFg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qCxO5rHjiR1ZHcEEPqtwWs53OXt7abEdIUTWveNeiJMGiZn0Ghsro/ikVSi1EhzFGz0Zab2gzk6saEXGLqZr57i3bRSNx/KMvbOibxKdLEPCGq9gjednApufv1FUg52hN5xqlAJ9fCwiDnBnJlsNBajimRXM7yKiIKvfkkwPEhj3/XhXG1lGW7bViAcdOJX92jDrscMv9J7L7IaiYgxiw7L+F/ey6TrgqvRy5vaJwfD83nnvIW7AFHeiRed9Fs2UF9jZ79ZieD4yG092YaVHLJivkfz6YZv/aGYe1Pa4wmlut6YvBzFE69J3D9vKuSFkJwHcfO3Hd8DtnzV4ipfKW5Kf6Cmz4sM0G4QlfpEwYF7K2zllDUML84G/uIK19pbwOtH0SPMUNu+oWF7EnlpLVRQX5NoUeE9U3dTpu3Nh7eNmKYj7T6ShYsaszkOXet00yYVFLgeuAPGqKYteRXvWdQNJtPsrbpu66AULmHBafR4qgD025r2x2mpTh+ZYGRps0yj8TCIFXOjHVZbgMVBYir3iKu8UdxPTX/bTx1KkY2wfLmA04UV6j1r5b3Ss72xej0pmk6Fn8oQRyvb5qmctrHi8Xy2Vo1YF5eCzxeEg7s58/hp7lCsz/XOcawxOXyThm0wNktBfD5kOwPQKdKvOOAemRmck24PpvSWYF1a7aU6S3cG+EE9+ZMT+wFZaXw4qPn8GiCtn13W+5OWpj7SY++w2MhytPd72D2ImFG/5uaa+Ebnofh7cwwouqTCV40GOsueYB3K+uDCVMezDHTavV1Md7XiYgLVQM5LbGV0jMY3fI3YF2ZJFLCCu1LAJHwk71qNIt0sHqTbr/G+2ETTJg84f1op925Iyne+LZbFA4hAyKnA52g8RqJjpQAMR4OWkT+6Xgg33XEFbHoi+hB6XbRWeY7wTTaFr8c+c32qgD3kSHlRINWNgtyU6EuA5dSXO8dIgEtPX/RnK5YL1SqETSNMpfFs530qGLWpLhRiXzTjUsj/zcduPI+gje1Xiq4tpdxlZG2sPd8Ex3HxsRk3NnI0DfDa/3wQ5okDU90tO0QuJU3VdjxOWZsZNCVhx/2fsD8AdXeT/hCUANRAlLg5f34G92S1iMiQ3MIX8/HaaURQ0jzgFSmS6D/FMx48XwVcab2cBe06hNHpuoJf4bwLP5Wj84yIhrww98wlmF3X1bu6tixhM7CWfmIMJ7WqaNgcooI8wHvNWXTlTDAqQbefYkrevUFTs5772SPG+ijXu4dl6FoBnLcVtaaqsM8eFsww8g85g/5GjQ4EFzyS959fRK2DXUeAF/dqV66p2blvZam8c42OzUG/npefD8SZUKetR X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b5ae534-4cca-4a17-2341-08daa16f9099 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 16:36:16.7773 (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: AS8P250MB0006 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/rl2: Fix indentation 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: IUHt8U15KIjW Signed-off-by: Andreas Rheinhardt --- libavcodec/rl2.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c index 7938ef1d92..e427a27dce 100644 --- a/libavcodec/rl2.c +++ b/libavcodec/rl2.c @@ -62,7 +62,6 @@ static void rl2_rle_decode(Rl2Context *s, const uint8_t *in, int size, int base_x = video_base % s->avctx->width; int base_y = video_base / s->avctx->width; ptrdiff_t stride_adj = stride - s->avctx->width; - int i; const uint8_t *back_frame = s->back_frame; const uint8_t *in_end = in + size; const uint8_t *out_end = out + stride * s->avctx->height - stride_adj; @@ -70,12 +69,12 @@ static void rl2_rle_decode(Rl2Context *s, const uint8_t *in, int size, /** copy start of the background frame */ if (s->back_frame) { - for (i = 0; i <= base_y; i++) { + for (int i = 0; i <= base_y; i++) { memcpy(out, back_frame, s->avctx->width); - out += stride; - back_frame += s->avctx->width; - } - back_frame += base_x - s->avctx->width; + out += stride; + back_frame += s->avctx->width; + } + back_frame += base_x - s->avctx->width; } else { out += stride * (base_y + 1); } @@ -121,8 +120,8 @@ static void rl2_rle_decode(Rl2Context *s, const uint8_t *in, int size, if (out == line_end) { if (out == out_end) return; - out += stride_adj; - line_end += stride; + out += stride_adj; + line_end += stride; } } }