From patchwork Thu Mar 24 20:21:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34955 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:ab0:5fda:0:0:0:0:0 with SMTP id g26csp1216595uaj; Thu, 24 Mar 2022 13:22:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxaw47GcMxKpvWKuJzFhwS9yc6TFPunNKihSY+UrPJgka1fJGVOztImhAJrhizyj/aT834G X-Received: by 2002:aa7:c789:0:b0:413:605d:8d17 with SMTP id n9-20020aa7c789000000b00413605d8d17mr8747669eds.100.1648153347417; Thu, 24 Mar 2022 13:22:27 -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 vl12-20020a17090730cc00b006df76385c54si405684ejb.244.2022.03.24.13.22.27; Thu, 24 Mar 2022 13:22:27 -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=u0JYIS1v; 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 35AF368B1CB; Thu, 24 Mar 2022 22:22:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073072.outbound.protection.outlook.com [40.92.73.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 52C3068B1A3 for ; Thu, 24 Mar 2022 22:22:17 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=An4iie8uXyH27vD2QdwTRFA7BfWl4FFAeg7RIllLR8g/g1fO56jzryYLUJupNlTF7SYjJ2wPquA+hbX6H1k76C0Leuhvz8PEt64EaZ8oEKWFxsuO1BXEqcKpUUFPrweybqS36bvIsf83ylEM1hPP8EGMD3WjCyWouSEjmeneV3MI7Ly4vB47XV2wJp874+2wW3dwIPoRFse+sQTmvDMtLD9v1UK6XxNnNNsgF09JwejxLOPOdiJWY5jHtLgarfi9LGiHZ2/7cPiwd7Tjry1QocdCjomGNp+eX+qEQzOQzR3Iax483WvddB0qi4Tf106IqTNNyZmu4n6S/Oi/LiTnMQ== 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=a1pSDI4oAmmuCdAw6AHYMoxD9+AfagtzRcNsuveVA78=; b=HSiWt8Xl33zuRTdWiEiRbErXUShVyBstsY4cOC6a/YfitBTKqTs8Go9SaH0/zZqB+EUPzHjVpvyeMivWTplbaphqqsIroPl9WZ2fO8p9h0wOQ74V69ci/zqjKJoUgxLwNGYAHqZKrKnJ5+/HJiCDNshwJCvfUrJmqt8djgkzqCg86uvd1KDGwqgufq0J6yUWwK9H8PqUcejabUk4M1vRI6EWXSg1egY6sTpYPlUFtURyp15WrzzSxlUcq+V4CfjKCay4UAC9CYZQcaaxfgEhlcdxes5eIYbZnAD2BwBanCYUJUtyu1lAAB0q8EVHePWFExAwGiX/XbD3pzkCrHBrug== 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=a1pSDI4oAmmuCdAw6AHYMoxD9+AfagtzRcNsuveVA78=; b=u0JYIS1vqB8Oeaqo6Vc+K8vJZxnr7+X0qGJDuoM1Ffmvm3yQInVDjGjxQtsNgTis8WLARripY0SQjEOjbWGemgV3SxJMGPyKV73BYukfyheAH6BCxzEB+Tgej9kJGPdxcB8nNPBYaLx6S2Oxgbr5/Dh9eUlQ+dWKDWSqmUqCQOYfBVZQqxy0r1EfgnbcZEnCVtrgKUE4C3IykExYAv58idzJMQT5CkWcSU/zAREVUq2CSrFBcrmrVRrEO4T/Usd8fEg/+7I4kR92q68pO5mMPV4hWblmGmnuzIACgumDZeCDyqcceNIQoXMVK/nIaWgm8+LOGfVFa3D/kUwagguz7g== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by AS4PR01MB9375.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4c8::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.17; Thu, 24 Mar 2022 20:22:15 +0000 Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8%3]) with mapi id 15.20.5081.022; Thu, 24 Mar 2022 20:22:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Mar 2022 21:21:51 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [iUvgzAuOiThvaNc3i5BxABE6b08HNjAf] X-ClientProxiedBy: AS9PR06CA0286.eurprd06.prod.outlook.com (2603:10a6:20b:45a::32) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220324202151.1016018-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9384b7b9-670f-4e48-c462-08da0dd3fcb6 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL9NwZueSqCZLZof+kQi0VWb4FPftGvZRtT7NTAMEYhbyNIXeQz5ectNe5enElaIJMs0SL8hKw0BOfuZQsgIY/KIy0kg/IE6W9uC6ywKcYEJDTOFVIWU7GbftMn6TFnnU5Z/d8j36OCS5VnI2TQHWNovQvrvl3X7tsDt0pjIj+SjzNCWygPmZErA3J6u2XZBo3VBEVJ4WWDVUUXPGqikOvLbLId08kdYhhKMWBxzAJfcwjjr9Q/6H62l7Arf0QEHuz5NNbC3+2Cr51szgrTbhuHEK4FsL0b3+Spib66d9FW8EXxfpcaMTSGO1OWmhGVkXl9oNs7HfgZl3BnTD7nk0VCKrBxH5QuQqLJMKX1VvIhZzYcDbCV+Auw6vI2CBxOCe8iiW4ZirsMPmfssVLynz2zbl0CpMPhlKSiM8zYgt9ojm5XWu/Hudkjk6c08GLxVmVbbkHH1iQ9lc6s7x4MPMmEvF/7qN77eyhFumPJ8XROurOlDig97Cz+2V8q8wvuV1dHIKlsZeh0giIVANfsucmzcTzYFbsAFM733655hZbWWH/2Y56S10VaEIfnfri+PL3WkXAZ2HS0W4B2Vi+mZQF2II1Z+pZWd3f1SR86b5+ZThjzLDmmCcQ4bSQO7BKrO/pcTmy+4l+h6YO/SVtzlLKDIj9rmg1ZcdUuV3uwl7yhP8POtFZBjTA2G/kiUC/l52hodPI5aGRduQ== X-MS-TrafficTypeDiagnostic: AS4PR01MB9375:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: toL9Im2/9sVXH0u8xBl1bCxvH34sr6Quz2sM+d/y+EH+lGg9Iy8EBD+k1RbMwuQFGKCKc2g7Fgpl9eJmY0coB4QvXLW8GwUqbp9jnQGAMsksoyryQD/3eq28r7S/8uIAf4C5LVCSaaj5oUm2dskGCX7L7oplft6L8N34vUgCGBsEpBaZUFQXnWMk6/jSTLE2O8YV3dz3/eN2fh8KAl9Du+rLVD5CHIdM4Q577O6Owd8tvwaYZrn2YWYmP7oRtsx0M6Nq4X6DndQlLy+VrQGjnOr53hXvPi4C8o8LrhVSexote4TkhoHDgZn0wDMr4nRh/c73piJZesZHh/5GlzXgB9WwbvUrRQ3gNCz86TvvhNf0po2/I1VRvyIzbOgApozn8PgkqkFijuXFkKh5GQ1lZkhebLvaBT5gI2iZih8LptmhKYvWINwYnEu1HgdpuanaIhKEXz0cDHOkmYryJovXlPqqkfdPIs3WgEdyV5jqXTFpy4QsJvgd522zUkoOrrUVHhUAO0NzQ/yCVrM+QemXbtBxb57SurX93EScBe/QTzUIWTT7H3aAGisPozwW3Y1zMbrBvdz+8Wi8Z+K6mMPUCQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bLJqRBCvVMxk83p4zWUR19c32kXEIX7J6DH3oOyReRfKVhVed+jLNHY7Scwt4vKzspo3ew8stWftuz3D6ReLnD0DSF2uCiQ8zCdud+D/vJC8pb7cYkXJGA8qZ2ZVorHYVq/5m3GMKHLmbdmvomqmKouiCbLiIItAtILOfIZhdsQdMO/8+m+cErcfUnfkGLe2jURAoYEzzs071iT7qEbzyFy+uUaK+z5b1Y/QQbHqbfo/TfqkKWcT8Z9MTf05J90b4svnowMHGAwn/x1CIC21Wt73R4u2zHT5FuX02Nkb5q3TMgmvyUsfRQeBckZ1OgCeYt7vWcR6bikugfZREe7mcYRlH+VH4s56Q0kwHflW9CUCDR2Yvm43h0xZewAC20kn4rWNzF7YKepLl145+TXZ1dtmLYzJ9a921KPXIg6dBv80H1R/kq3kwh40Y74TJFN+6XzcWHqdnlEkbRItSqUc48MYqYzSe9b/yMmfjLke64/TjwUXV5PFUGYjxRE6p7Zj4aqvBBexu9P77yG9W29t9BdSq/iAUnWSgcQxQHoSWYePnDXlC9zRh1yVMtEAu5f9inWoWn15ZhMXI87e7YQWnRfOVBAe8pfnogvGs7SeN3Xip/NZoNm0ETxjQVVjGMmO12Fet3hGnSJIzizQrgeK33KauYASdf2H3fD/soazXRyPb73NhPATn7vURvAr1bml/RWG9BPu/Vaf00e9apMgUBlAEevUMBZ6ah8oirhy9usn64q/nVvssGp8AWbxaB3RAWUCzBGVgzzviWucwpFc8ege3hIMlQCa90bVt8AkiUlFsAol62qgkpry+JYjMHwbPrJQHaDt6wXErAg9jxyfMzABtk41EkFI83GMfbQ10GOvfnOu3PbX3VlsEifCC/Rh9MnYAG5q9AXGZHUYm1W//IFucqQZvzLqL6rAdRfFYh8rrffJr5v/ynmby75cnJH8+k2RU+EoBBo5IWP2/i7aXN7YSFe75VaiE531T/0psHqz/IrGOsIciGSidpcjPhj0ucmkJN+4tFeQ2moY4dGCnTAdkDsklT1VTtFVPOhKy/4H4LDd1MwDVicyIADqA0e+iu7TBcJK+u0ytY+UueYKeS62r0ZYTkA8oxpqMn8PLW/YdF5xYabmh2iLA09NAgeqBOdkkdM+SOT4K4EMwAwRSwYZJkO+bPWpAD5EfoB/IVc= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9384b7b9-670f-4e48-c462-08da0dd3fcb6 X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2022 20:22:15.7317 (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: AS4PR01MB9375 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/h264dec: Constify slices' pointer to the parent context 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: aq3HS/O1KxAs Modifying the main context by a slice thread is racy; so constify the pointer to it in H264SliceContext. The code itself was already compatible with this change. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264dec.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 0b9c5784a2..9a1ec1bace 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -168,7 +168,7 @@ typedef struct H264Ref { } H264Ref; typedef struct H264SliceContext { - struct H264Context *h264; + const struct H264Context *h264; GetBitContext gb; ERContext *er;