Message ID | AS8P250MB074423DF71813D281F21FC2A8FF12@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
---|---|
State | Accepted |
Commit | 02ecf8d7f3fe6ad6bc493a37bfff65bfe9150113 |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:142:b0:460:55fa:d5ed with SMTP id h2csp141292vqi; Mon, 27 May 2024 19:49:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXM5f3DE5t2p0CmqRL+L5/zmNGYgwnnAR8l+gB7KX17n6VRa7dIytMxjyWayDQ1vmKiWD4Rar3ZXrfbhhTfJUXIWjfZfQiGxCnTvA== X-Google-Smtp-Source: AGHT+IHk/V8G/2yTivhSunS6BxzqHIIi3mThWeXICnSLMy3EBOcmt+Nf8KGgwQaeFHfJIU0wxshs X-Received: by 2002:a50:d5d5:0:b0:578:5ec5:7693 with SMTP id 4fb4d7f45d1cf-5785ec5791emr5900347a12.3.1716864587729; Mon, 27 May 2024 19:49:47 -0700 (PDT) Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-57852495ee0si4354455a12.382.2024.05.27.19.49.47; Mon, 27 May 2024 19:49:47 -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=esgx8A0N; 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 8DDF968D50D; Tue, 28 May 2024 05:49:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2070.outbound.protection.outlook.com [40.92.64.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 05C6768D504 for <ffmpeg-devel@ffmpeg.org>; Tue, 28 May 2024 05:49:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JlLjNGzMb/TVRQAqabCEucRiSf0nKCYf1Of6tyJD/GcgVEsNEwv8t7fWl4MHkfu8p5zY1E9Y56Az0DwPNnkkvWEshW32/k91VDMpQwd8cEfimvaZ2qOiGnu0LJ7sovLX8eHQ5jQybTM5+OPITOKZvdM4eaAQgvIamRePN27Yt8KlukJU4d0rIhSHLXGvS4nKIxHfMKPiPARM4w0R+Y3DC6cH0HTyx3I7G7sdsPGWAJwXaj2LCsOGewlS1M2wcrxN61OUJLWO2gCniKk2NVpdmTzWLfBXkyV2ld251YARjSLJVKNoDXmS4AD3zZ3De2ldaj9el8oCO2xbzYx8SZumSQ== 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=mRok1aytjA2KhNJl62tkb1UyfHB1Toy96pqU7apM/Rk=; b=k62l7ZDwk3IrzDAgXWRx7BnVfzIOi3GW+hv4YbXRQeohvad0LtAv+vDtU9h9j2yie2Y0ObnrOXnItkZ4H8/ixvFhJrprDGQuH8HhK5v/JGpRDr3kjDMWu1d7nwotf8amSUci4GDvOycFQKac8lZx/phjZ6F+znXIXNTQ/9XHZwno7JuZ0Hg0PDHZHNAggwI5Po/Mc5RLE3uyRCRa2m74taU+WEoqlqrpiPNrFQaRCWnfQz+kAr2z4uQS0j0kQ39+tLTnj+hgambEo2/6SmphOWjPyR0wGhAIUiBAQbtSYp6XdtsL+iLQlV/KB/TzDSkt0ExRiG+ZYlcR6VRPjGUgtg== 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=mRok1aytjA2KhNJl62tkb1UyfHB1Toy96pqU7apM/Rk=; b=esgx8A0NxalCyFicLd/VRz+ig4zaIH3rlkbZSmPjZqzyF81zKGsQc7HQhXg04blDdQtEXny9LKHZn7UufXREtVlR/F9HJKmWDgBgDZxhnCI9Lmzs8SU7p3rUHM9ggvVGxGG3w6F9TUa6xNgK3f2rXUN8nxKf0YWklfQ8vkb3AdinlHqK3V0T/ZyxOBmxiaKn8vIMBYDjm/chdqDuv4y2fBQVviaOa2gwzSwEozHmFuLGvtSNFR8tfReseb0brNHr72lp3FywRrjheLsmfJgxcCFSmclrEw8oWgnP+AnMltOmtJVN/lppgNrOpzxtw30rEkYkIKxDNs/Lgs9CfEUGFQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0183.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.30; Tue, 28 May 2024 02:49:23 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.025; Tue, 28 May 2024 02:49:23 +0000 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 May 2024 04:49:09 +0200 Message-ID: <AS8P250MB074423DF71813D281F21FC2A8FF12@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> X-Mailer: git-send-email 2.40.1 In-Reply-To: <AS8P250MB07442EF03FD5DC8CB1FA9E1B8FF12@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> References: <AS8P250MB07442EF03FD5DC8CB1FA9E1B8FF12@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> X-TMN: [HPDgVtoh7KYiWHEDdiL00zv6pzPS9rM/ajpgASWYEhA=] X-ClientProxiedBy: ZR0P278CA0161.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240528024912.3310372-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0183:EE_ X-MS-Office365-Filtering-Correlation-Id: 6331e537-0da0-488d-7ac3-08dc7ec0c807 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: SA/Zh5H179TJv+fcqUYGanrm7G/K5jv6pC5exSMZbTqozEic4cb8uHlYZSy8GeZRhUlAl806ozm50LFPHpw+8CxnTYrQSFAJVn3ZmuSA3V5FwE/lz1GFhPF98lMJENuq8qhV9T5+wsx95N3CRxZViyCgiRljPN21R1qWoNM/hRXnQGB7hL7r9+WQjY0OydEgeIQr5qWJBcPFx/qAVpyLFoOwwph4zVPtNV9MsIU+iX6ZGni/snIjA667/KMOp99xmR6a14PKJdwUybYE5d3MjeHExPV/BeyOwvZZNNiyHJsyEZRfEGZEyWOie5B7ttg1/LJaI0niTJZmVSPZzC5qEsec4XeffQbnwQH6wipAS6hT3gx9n0T5fN234FGmY8RHrtGAr/eEofqsAiOH8APqTX1ipXLE2WxzFfyNBCSVllAzImV6xPaPeOH9aOz00Kd7HsJ1UvnKaw525/amY9dsjnivDxrw9+LW/yRthoMIcBfGtUbXlmtKVz3fvpsF0HmKHwdf2ThYqe3ZHsUt6oL9W5CMVYkMvzQdhDnlKyIsLmgTnUDPerBcXZVpQNCw7pUERdneIaX+10igrH+NjX6C20P68ATnXc8lVc1IXOQLVRpkX2vSRgYMD4VR4kBd23rN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Keb+tGmjqpol480BqbxneMffs+tMUuVmcPf3BpnCrtHz38Jc98FTGvbJkHlsJqTkYYuCOEfFNeFcFLEgNwnhAKD5NKjfdvjCbnMAKhtI+zz7pfpjTeMEoCDULI4ZPE4YIBZwIVtVw9Y6wyL0H03mKCwr+JPOsiEhI420Nps3/CdOC7Wke7u7OzonMSAop91aKBHrxvXsAUGWO0rXp1wkc0loPwMYMNHJuiZwnNw+BeojCXX6klk27YGbxSyZkmPQ5Bmm55owfDWQfUewze9EihAeiZTE787Ud1dAztCn2pC6AXr2BPjdVl3mWN3DCTFx74gL11hhDuBnPXR8Szk3CPo1ewD3zqBjBTF3IEy3pmIvky/tag2sb68iTGtVqSrdILAANEMVQf68cpE8U7RgUTgsqFilXyjau9vF95VbpwzcQJ3jDTg6DNzDlpOug3sUQWw2xFbT7dSrTzqhPLQKPdCe7joewk4oMasnyA1KpfNzePCkfm1DRMh6Np6SPAqdOt/jpiKBHH/Vt+U2imkhAQNLh+h8bWUbnPpaFWN9kbM6t21xPKKP0HrcS6IQ3SihEgtXVqNMcpyXCcUA4aCXnDyMdItBlaYreVZVqD9BuwSAb5qibVCn887+WGswHksxyuT3VlyEKcsrRLuc6tuDEDr185gbyg7G/l6gKV0zoXM5Ab4VcaBxeKzAb6OAAD/CW5ubOrXrQ+++Cg08ATwOfveZJaYYOsTK2EBOMRxDZxOWxsQ7YQBnB8UcRpuqwIyyoDGlx999M1bLegSVTGZTZSE/hHRdx05tu2ZBAqafJnQJpESDCMw0XK+O/ivETwznmireYP07JkY28HimUAN55GzQmomMQq0JA2ggYSxwkrqfidrX5Uo+Z9yayHsN2L5YZP+s6+TWPmQtPJLqdDLN7xOIKg26F4zU26a1Fe7TlufphYrEVy6G8Ty0eIHvxy7bDLbLbGgCz14uiJmvl1k2Xp3meAG93RH7u1UAfM2N11up5GG0YhnBFDas0bBOMuHZa9uiHakVJGAQCpkkRVIUvvNfiXyz3caqbJL9j5vjgW2FoDbY0xeVDaoEfPeD6WuC1ADqHjtCLu6/FdsHs7tEyPwC2/UXvKQCdRw14ORId5B/YDzPP+Wx70h8/J8UiVdF/lJYbHMdZzzvses+3OX5IZMzSNwCapMVzLT5PEq4UTwUrpTio6R8RE5LyvMPjgs+4Ps0K9QIoCI59m4/bo9ArX6Y68tViGRn+n+Gcr3MSHb7vPguV2+LCs64V/b6MF/g5GqAt+itewy2hz59RRhLqQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6331e537-0da0-488d-7ac3-08dc7ec0c807 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 02:49:23.6441 (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: AM8P250MB0183 Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/vc2enc: Fix slice length X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: jjMJFKRPLHe8 |
Series |
[FFmpeg-devel,1/7] avcodec/vc2enc: Avoid void* where possible
|
expand
|
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index f39f368181..3285218724 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -788,7 +788,7 @@ static int encode_slices(VC2EncContext *s) for (slice_y = 0; slice_y < s->num_y; slice_y++) { for (slice_x = 0; slice_x < s->num_x; slice_x++) { SliceArgs *args = &enc_args[s->num_x*slice_y + slice_x]; - init_put_bits(&args->pb, buf + skip, args->bytes+s->prefix_bytes); + init_put_bits(&args->pb, buf + skip, args->bytes); skip += args->bytes; } }
args->bytes here already includes prefix_bytes (see SSIZE_ROUND macro), so including it here again and forgetting it when offsetting skip seems wrong. This only works because prefix_bytes is currently always zero in this encoder. (This has been added in b88be742fac7a77a8095e8155ba8790db4b77568 without any reason.) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/vc2enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)