From patchwork Tue Sep 13 11:32:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37885 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp627760pzh; Tue, 13 Sep 2022 04:33:24 -0700 (PDT) X-Google-Smtp-Source: AA6agR5ump/NZVPzPZR9V+oXn1aYN5jGhTXUoW+33ZIJCoAudgkCPMjPV884VGpQ4UQIdqsaEwsL X-Received: by 2002:a17:907:744:b0:741:36b9:d2cc with SMTP id xc4-20020a170907074400b0074136b9d2ccmr21096902ejb.613.1663068804613; Tue, 13 Sep 2022 04:33:24 -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 n14-20020a05640205ce00b0044efa9938d5si9850818edx.583.2022.09.13.04.33.24; Tue, 13 Sep 2022 04:33:24 -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=q6LS+k2C; 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 98E4D68BB15; Tue, 13 Sep 2022 14:33:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2070.outbound.protection.outlook.com [40.92.90.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B578168B96F for ; Tue, 13 Sep 2022 14:33:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ThRguuvmh/II/Y5PodfKNtIbRdRh+YrdmVxlTekPx7FOumW40KhLzDpTGR6w4pFF7hMrKZuayJ/AKeNLvCwhisCKJyv02mPtctyMqOGyd0pcR4iQ06ph355AOOTjESFnyxSO3GH8d0NeAY1/K/7G5N5IEBrTnymvgLxxvyTZphjxDghQEhWY2tbtKNWNMkRlQF2/qijOOTZpQmWVd41xckBLXiB3ctiBXEdvTLDem81Bd7I6+YKQWdkJ5F1wnD+qTYdpabVw+0EOEuOO3n4O4672iLKwEX15x/pDTaUinCKfa4O6Rh547TOx44GT1ZYQ0rwygjive400xw5SN0ikPQ== 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=SC34W5l1Dyly4g+IDEAnc2jdACxrQnNsN07QZbf8UoI=; b=TuUTqhZTOoEuay+N9/WJ+e5gwXTXr7ZyX80xVevN3Wy/FN2GhAyjRWiYmRlq1lKlDb1qjlSQxJXMaW4Bge80dR0wPhMZbGuGXZdKCcmaqhUzUB9h5TcZ7UeZebk/U3+02M9H51oRWXwunZ06UU9FmGDcjEbcpXRT9g8EFTSVRJxDv6pmC7MXU7V92b3yy8pbg7nmwGwn9XoRdTIGORMUkzV2Gw3o0RLh1n/1ma6gSQH0MwH9YudNevdmCvohhrCPb3tmhsY90eiel4NBfrUDnG3KDKOldbJu8zSz8CBRrMwYfUiK4vVp/pz8HeNGyXJSnN61ux5BL5xF7Zfw+QqBaQ== 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=SC34W5l1Dyly4g+IDEAnc2jdACxrQnNsN07QZbf8UoI=; b=q6LS+k2Cj1t8ZP8cQYaDaz3wD5tCW2WyEsUDnYsnUhRZWaCF1ZcXaaUvEvXflE8gXVnAFzWHIlnoni2CQrKefb+u3hmbli5mU1mlmFU85x5Ja2Im+q4pr1hOqr1yulf/JS/LWU0Ef++OAeCKf2xT52JGfxf2UrSG1TevL5VUdA1qVVTZDPkt5spFwcCyxHKs2AtEJnkpQmC2ig9Tc4jPegAxa2O7HUDE3eqx7aKcOkl1XuprdhCNYR8+Y8R1sGUR3DLGVlEY75m2PZoD1rUWhfHnTuJUDYHfKMf5/ECSsqnZQBWQvJY5P+LRpnL7qXHk97mqLXuOmGUbyPvPTHdBFQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0072.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:374::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Tue, 13 Sep 2022 11:33:13 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb%7]) with mapi id 15.20.5612.022; Tue, 13 Sep 2022 11:33:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Sep 2022 13:32:59 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [w+xsffThKJl7pjt+H1tvu4JGI9ss2vDwG8jg6yNjZAc=] X-ClientProxiedBy: AS9PR06CA0296.eurprd06.prod.outlook.com (2603:10a6:20b:45a::16) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220913113310.451876-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0072:EE_ X-MS-Office365-Filtering-Correlation-Id: 186ae907-96b2-4a82-a15f-08da957bbe28 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKy7YnLMs5Csile4q0ca2x3wjhig47XmuUIFBbjiXpOtbKQcBUDUU+ay3K5WSk8i4wx4NDU1Tf0n/jnm1jNTA+Zfr1Nk/Cr8Z42GzzBU5d6kmFCtz4N9I0CQJadEkGvxsZ7PeljW/H4I68JH18AiokwTOhGjQOUOEF8+aSWHRTq+6mgcxHXRftA/4tPvHbLIBa+ZEfBBQWjx0FsOEJ50x4V9s/nPbmNDqQD2EUzvDnG/IAzaAl58syOQLeempRNy7yg4f5tTlBPOJH7SpvCvBX/pj6cok4c1PWBblhDM+dqqwESRkVGerTVKduH0heJIvajCuDfzbUGQMd8q/3yC53rtsimcrjSeJFU2DBTUqX1nPvZOoWMV4OvqyUiM3aBm5ZY+2odXqb5M5E3AZkaKKKBG/3aUBGqbWP5YnLTeBeyvKt3n5E5C7Sjs/nSF1UxIy5fsXeFJw2e7wVsfOhQifbLSjpXc7cc13m9e/iEsCeVlzCA2l4Eoarq5+/rC5uYERA7ZQJRgzEXiDRzU+YcHwjR563HssowqbDXk7/CSKyEQuPjti+s23LftaHQMA0iIZSopIl4rwgTKwOyvTuvowq+iTBx2wDpf5OA4LjS8VtDetidqm95Qmiv8Ds+9rqMfqTz8NJnjVhgJEVIpUaB4T0NxWbLeFMfaqvDltojZ6/j2zfqmi0JymDf2Fvn2ipl+BZbRJ4xz9cDsx8OX5dKnlejzkIQj2ViXi78= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JC0zsXDxT0Edq085nTShcgVHk3tKktU/QDjWqPUmV+R8i/Pcky1uPDPEaXeuvHqndW55eMKK8m7NZTm96ZdbI0SJ/rouz5JKX2BDxC9JkOkRENeYVsqKFMIW/4W4UnMLW6CZ8rWfTyJ+DI3coDYBdaW3px/jDkuUuXSKcTBw95HRviM/zCpj8gvPvNWGpRyvSzG+FKJxlCLvZzwnrTOYxI+QEdifTaLt0d+ZTBfyOGBKDws1z2zsu7dOJwb2UIPu33u0YsSzLl7yMrpJDg8HOx5fLjrWk5mkzwJHeOTWvk5xl6XY5Ct9Rga+6ddZFuyeMFNPUvogPWMh6bHNwEU3Im1sE+qompXxHB95J0ZTiUaMp4tOtIo8xW9Exmj3w7Q6VxmWesJ47nT0dDJGW/537VlOzgRe2Kr1+qNK8M4zoTgge2H9ykyu3Us4HD14VbJbRKpOLtwDWFhntzZpLRgNmHWZJSbkoH/CnT/GArFRzzgFsO+aKKPTta08ewLOLGgWOQK3AvFrdYUzrriiVqw6SRbTI0B75T5I9975IYdUsT6ob43IN6Y/AB7t5acoKQE1gKBQXgIsVOkV/9d9hWauPAvchb/chUY5D7g7+t+ULpt6ZL9M1+bAwLPcvZgc9GapIeqrmWqQjwB/J6Mx9WaL9w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gdrPRveO1S+JRoWME8e2L9wirNOzn24PovzOduO3upt9k1ty7a9WFm+A5EjMrzzqv/r3UPhGzki4E74DGkXTcLZgzePOn0XM1faiIGsqUe2PG9s2ctzDqcIoVvJPB+8IlDXA0Mj7VWkQgYkOQlYNPYAL1iF81Rh7epFo21r0T9GPz1vrHdGZj+lorVNTKIA/jH8/3ZgyTtB7uHqMyMzL5/jd+y8KxiHWfBc7iK3x4I/Tx8I7rOwQMn+othWdaAnEyw5FLFXLAsOtaMKG9E5T2nudh5CMLDwr4NBjpdO4jAgcmvxZ9Kq4wIes4Vv4QpiufNwjf1jpXHkPjV+Sd/5KdOcAasy/XPiFmtDN4VNQhmusvSM2yRHn6GGRKrBMD5Oq+TPywwrlXygPSjYobKTs11JA/+S4Aa/0vvvl3RD6P0ducM79919VOSupMtwRAN0bsVoePF0QguENRrINryDySiRYGAs+OKFJT7jrgO3WgNy6BxijelT6eUxcelonl+drafMGRRkXxn/YXCTg9WwuwNYmIVfkirz/LoM6u9kVfc+VoBthzNcRcZmz4laU9bS22fa/OHxIX+jpqGZxpQ9/xTpxd7ihzwxnrtvRSeNTgTcxpvhJuj860qLq9sMPYQ0WK9z92WkL2rfUNVG9SaOC5duWQoTMd6V4LWKt6IvPyTyieeqfmo1ESxhJH1sI3B0nQl064A/MQXnxR4Zed7AnCpFjy3O6MGjJhnAqdJMHw9IJgtjL0CoONhsqw+8LvGM9c1Auhpbve6sYTZrGOdtFaY0RiIqnyk/bkCJwVO+qh3/igBMEt7h1qoMg6lBA1D+jNLAv/foY1gsStdv1HM9XNTiyzwqMhmSFL+aDK4BIGNrTpSD75HEXeaq9pGLCrDwzCufEij/3mUETynLmS39aFpKrcjrtH8MDI0oaCtnIt6jthO//SYB584cOSTQeKWWvMebXKJFVgp0/xmGcikoCUweEZ43MA2R/rxU2KUScj2qqySEMcr36pezuI4ovZd1DxtBMJSykdOdidlpXzTmDWFpuaio/aC74quk/KXtLAN8EpzjrKo+NUb3B8HcQkNvFHphhKAUpsk7KQH6qpqdz9Z8x/7jOksTnQ3JYSUT7hOurHPMTEI9iyCF5nIu4EMN2g/vMmcNvTDXpbcMvd93b4DIiI7KiGnaVw6PuZhrbkiMF6TnFgoUtvoObSPnJEzxDDNGccTPrsLsz5BQHlN8H1GUs9ywETnluiErt+AvNzyH8LcNyDGNJ5L2ezyhgGeMqsPGhJZ6fmrRPJbelEQthcPOp9cEriYtLG/7F0XyfS4vbSIhxdakNytnk1Gc4va1A X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 186ae907-96b2-4a82-a15f-08da957bbe28 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2022 11:33:13.2383 (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: AS8P250MB0072 Subject: [FFmpeg-devel] [PATCH 02/13] avcodec/dcahuff: Remove unused define 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: hWL8UAD65Xi5 In reality, the bit allocation VLCs do not use the same number of bits at all. Signed-off-by: Andreas Rheinhardt --- libavcodec/dcahuff.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/dcahuff.c b/libavcodec/dcahuff.c index 8d5541f9d0..d1b64798ab 100644 --- a/libavcodec/dcahuff.c +++ b/libavcodec/dcahuff.c @@ -44,7 +44,6 @@ static const uint8_t tmode_bits[TMODE_COUNT][4] = { { 2, 2, 2, 2 } }; -#define BITALLOC_12_VLC_BITS 9 static const uint8_t bitalloc_12_vlc_bits[DCA_BITALLOC_12_COUNT] = { 9, 7, 7, 9, 9 };