From patchwork Sat Apr 24 11:14:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27274 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp2034793yba; Sat, 24 Apr 2021 04:16:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvzFaarcG5Fg8nVxzblWmBmB2LO4QC/nOuugjpGFf51+05iwRMfoDDJMFM2gdktkMVhzCx X-Received: by 2002:aa7:c4c1:: with SMTP id p1mr9589061edr.133.1619262960993; Sat, 24 Apr 2021 04:16:00 -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 l11si7295940edr.343.2021.04.24.04.16.00; Sat, 24 Apr 2021 04:16:00 -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=EA1oZCtR; 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 4ECE668A03B; Sat, 24 Apr 2021 14:15:38 +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-oln040092074033.outbound.protection.outlook.com [40.92.74.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 522EA689D60 for ; Sat, 24 Apr 2021 14:15:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D4S4/pMb8GxAqwWuWNgbFV/t9vOhIO67FHooe5xr2VVn6KTmnzgf4ffh+GyFebPnF/ACI9poadoOccDe4dHBQYoxDVMfVFNlkZU+wYZAya5zrAFQU8Myz8EEot0zuJoQAx7X5tGlBUwG409pAt45ddZrEMdziWdCLQCgTHQQgqQQKcItqMtSOs4NwmJZEclx9k4DC3XZr0hoIqOPi6ZKw2vAUdWh2Ps2FXGpjA9zVGz/qwifKbM5cwN1JdUfwg/UVwnrZ4r0zr2979sx/bvI//zKZikn7tPrqg/jlAe7JP6qsdA1hOdvXNOqZk+z/JRsN45+6icj1cUgXLYfklU7WA== 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-SenderADCheck; bh=XJAZIuC+opJCZViAoQ69M+iRPtMxx4xy3ZpJmp7Lz9o=; b=fSPB8dGYrmNjjOa9m/NLS3v4FhZIQ+481mZ7XcbBmS+/HIyO8eKL6XDGhypd5XOpaLgbr60XYPzSSfKFHe/4vFbffm5fX0G9Km3A96s4NdQXKpVWNY54cDiCyrX4/JOMhL/d+ZcyrYX2iOvI2Y/z4ev6pifOH2rTLMa9e3e1ZHosdlhFSxgk9DbP3Ee8nx/gn+bpfzTLHWqi+/r+7HNP64iVX/j3qMizZfaYI7riPuQ9Z+jsELnr7wK8A1dKW/cFuVjmZ8rQp4fj9mLshtGAvDsfpN55jh3VTRXEJA3NQihK7aQ+3BGf4HvvegwuwgxdO+di0WEjvuvuxmbrEIdDXA== 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=XJAZIuC+opJCZViAoQ69M+iRPtMxx4xy3ZpJmp7Lz9o=; b=EA1oZCtR9IktT4Q7TCJ9cVoOLoRweb6Jh4U6ghauZzAOWSpT65RtO3K3ArE7UHA4DMR6fcV0ZdlYIhvnDkAl4Bwx8HL3ILhC+lqOshBXTwCl3A+5Z/nAKF5E3+wVwRO+r6Ssnt/pLIg236HAApxoJu7J7GGmZCVXEUdCV2NJ7EvsKdlDnIxUeiMRWSQyvpAqDYoblwrZZKG2/MAq6JOtRBuVQG0tMEbKYC0wKpT2D1H1dBtBEA4dSaydtOcK1eNbuHodjnflTYD3GTIdPq/eIEgJ/bo5xXuzwh0TFO9w8q4O9L6M6+vi/1e7wN5w7h33kHmXzxlWm3pGhBN4lnDrNg== Received: from HE1EUR04FT042.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::40) by HE1EUR04HT189.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::176) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Sat, 24 Apr 2021 11:15:32 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0d::46) by HE1EUR04FT042.mail.protection.outlook.com (2a01:111:e400:7e0d::159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Sat, 24 Apr 2021 11:15:32 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:CD075BA98AA3746DFD6663334CD23BBB2BD017A013F9521DF1984C0FEE4331B8; UpperCasedChecksum:4D5AFD885CCBD60E13F218896CF3BB99CF9F2F65286A2AED6128F00DDADA8569; SizeAsReceived:7590; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4065.025; Sat, 24 Apr 2021 11:15:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Apr 2021 13:14:38 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [GkvQrcipm+eAzCXQ/gtKk8Tfa77qPKkE] X-ClientProxiedBy: ZR0P278CA0160.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::18) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210424111446.30338-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.248.86) by ZR0P278CA0160.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Sat, 24 Apr 2021 11:15:32 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: f976bc1d-cbb9-47e3-0209-08d9071246c0 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUdbPdAvhx5/8x6B2xiI3vbSUlQrMwO2aw+WGhgc5qQ9U5FV7Ff5VJlDByk2VYgb9k7XUSpsyvrjcWwInF9PlH/X3+TGcqlEvMKNYq4acpePDYnWkIDI9BKGAqN8LzMkkiufahtvnbfrO4wtI4oYm9ot/PmxkXV3nv1h+LQpzB+Kloa09MNnUnlg+fDges7pbdub9e6iDTd1F6NskZFhsngvoOk4V7sG+rEYzRUKtK02gXPZi7y6x2BsRKc7WYaHWpQiR1TfJVZPq7J9e1gq7tsP7OarmooQQUdGsfo33NtKTA1gr+wkbPh/EkFLmLMlFO29JJ44Q4a1zmrWtz2o+NOkM1t6bxNYv4n0HIuPD/OBVTLMwBX60zY7sG4WzgZZXon22wmVabeFVGpP+VRWfVEDUlgoJzDZnGkArPgP3QuJWrOXPTC9d7oOhJw/KGYj+KIt7/VUWjBXTqbzq4TxjwVGXe4PrJMbkkpom9nKH2M4hXUGGUmpz7PrYdFTVjMRkIOdxbUl++9PD8qdcf4oLlvdEwhx+Q0wX3KrJVjaUcgr8bFhw4mX3k7NsgURpg8Zcjlt8RNGdZFXvEVHUyNUXOV/9swWhmVAbdJhYZVL+cPfT5JvFn3Sil8/7WZbeHfSUbxOYXAAoHOlB5aMYNCI/9xFebzUP3zOtNNgEjUxx2gPLRLi0gTwyYLjC5GiTFRQAlorkMc2nGRRV4UX386PZevc7m+ZWy9AZw= X-MS-TrafficTypeDiagnostic: HE1EUR04HT189: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hpbAIOI0ZEwiWM9qC3kOeQ2S0GyS4dpfivEmxzQDOB/f0CDOC6x/qalvxE3LhDY0WAnLnTLwRvqRfCX0spKWnEV1EQIq5z249RAZsiuJ0PNX0NAYuwpiJm4bryP2/KC6593c1ZyPpkJVMPieNTsB3iIEe/ftI3iGLkVWyRkrN5Op2oQ5a6mJPa4rp7vH+R9brTgumYVpPFde52HEZtz+a1RhT1c4KlL/QdsBxvpY9FIvKF2svyyxcV+GpGwx9pvon//43NrDaOkYI29KuV64QNMKcsvLtKZt7vciQUzKw7/jBBo97J5aieBgfcqLBPNJAK8PPU05eKiwoUeYHSN9uj716mxaijO2CQbwzfiaYLGZBr4BUPM18xz79VPw01CQ6seaxiXjpbbkFikIx3vK0A== X-MS-Exchange-AntiSpam-MessageData: gL+A405ozMyNioBawhxnWu9+irnvPD7xjh8IlC8cxfZISZN5pnXJDm6HAM96r1Tdy77wjSRP7oeY5C6rhOu+ERrxR76+MVYBIVzdMw7pDAuPBByOeZnoIKDJOiVpIkc8t1IuWRpv6LmlQBZNTZhOyg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f976bc1d-cbb9-47e3-0209-08d9071246c0 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2021 11:15:32.9689 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR04FT042.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR04HT189 Subject: [FFmpeg-devel] [PATCH 06/14] avcodec/ffv1dec: Reindent after the 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: Zn1VS6OSg0h1 Content-Length: 1508 Signed-off-by: Andreas Rheinhardt --- libavcodec/ffv1dec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 9a9ee10a4c..ef908a24b7 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -1037,13 +1037,13 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) sizeof(fdst->state_transition)); memcpy(fdst->quant_table, fsrc->quant_table, sizeof(fsrc->quant_table)); - for (i = 0; inum_h_slices * fdst->num_v_slices; i++) { - FFV1Context *fssrc = fsrc->slice_context[i]; - FFV1Context *fsdst = fdst->slice_context[i]; - copy_fields(fsdst, fssrc, fsrc); - } - av_assert0(!fdst->plane[0].state); - av_assert0(!fdst->sample_buffer); + for (i = 0; i < fdst->num_h_slices * fdst->num_v_slices; i++) { + FFV1Context *fssrc = fsrc->slice_context[i]; + FFV1Context *fsdst = fdst->slice_context[i]; + copy_fields(fsdst, fssrc, fsrc); + } + av_assert0(!fdst->plane[0].state); + av_assert0(!fdst->sample_buffer); av_assert1(fdst->max_slice_count == fsrc->max_slice_count);