From patchwork Tue Sep 26 22:17:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43971 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a18:b0:15d:8365:d4b8 with SMTP id e24csp2212010pzh; Tue, 26 Sep 2023 15:25:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGae27VSfZKA1oBRF1du5SOIz8/NaHhgpV7esKoPVpIl+uGwi7T6ZI+B5013jJSGUC+nfL5 X-Received: by 2002:a05:6512:214c:b0:502:a46e:257a with SMTP id s12-20020a056512214c00b00502a46e257amr60976lfr.56.1695767116182; Tue, 26 Sep 2023 15:25:16 -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 x2-20020aa7dac2000000b005347894c8a1si1171674eds.131.2023.09.26.15.25.15; Tue, 26 Sep 2023 15:25:16 -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=jX15DCdU; 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 C1C3268CBDB; Wed, 27 Sep 2023 01:23:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2086.outbound.protection.outlook.com [40.92.58.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B4E268CBD6 for ; Wed, 27 Sep 2023 01:23:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cx4kaveEth4yPKnrJgLGZgAlqZqe3RNY3lwPwkFOAoBqgSirZZpSwGqh06apTPpgs8FBCJhR8yCLB+dX1n4ope9fRY8EdSXol28XiaRmU9yRDJY1yvT6YibkZgyMIIZq/4WtM0sTHovyySjfmGRWXh1Y1HCM1zEP0dA2y78O99zbbO/lvIHeUCHGl1IrB/UmNvC1nRTKG+xC07c42Hhy4B0XUvuxm0TwI0iMek1itlVHxe1NEkMlqh6QGdwziUVxHFw8jRvTBWAFlAwCkBdZMmW1/Vj1unKvBxX5ksUha2y8927TB5Dehy5SpJ7Bnio9s+UGEjcNZ+KKTxEINoQbjA== 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=Rb40G5Ip5gBAVRq/kyl1C7M4PbnTFQ5UK6VyTPzn0/Q=; b=GoTHEe3NEwWtrYMM2wM3nqvtnAXOs7gYICK/OTS89s1QbBvDtZuIi0VMx3sp9H3MywimV1iKelEpyih+GFpT7zkvChzglOb4BipgegaQFuJB2eq/2rZrGFlsISpVyPIuAlIxhSVPGIgqPhboQ6vmXS/CUd1xt5+uNQMFGZJqEldcuhVYTdbMFnyqXcU8N1WsHFxZYg0ZFLoX+2E73uKAz1ng05Vt9bipYJxodWbp7ASN/62Z7julFtLaaDxe6zc+KvtWsCxPwMDv5PmSvnIhppkVhp4hl6SBolG88/JtKugXfEy6E60zMHCBL22kq3EknnNeCMb5SjUOuhhJ90xtvg== 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=Rb40G5Ip5gBAVRq/kyl1C7M4PbnTFQ5UK6VyTPzn0/Q=; b=jX15DCdU3O5f6kMzKu/FukHQU8qaAG0HfK+GUB7TLjKEqFOwr3aBhd25QxLoXSC/NTCdTNy0iaJuoMDqiDooE3Q3PgaSlPWwhVL+kS/CWzFhQ3XiaGdRzD4A9fTJOAfGEKwp+1qmW0CneHyZzGgPFbYniJXneZZkwHuHmvn+q52KOq7b6HlTWhX+GW9n37km12R7jf4xzLJUFi7yI/xixIVKFEZ+B5oGwgh7f6vqU8aq3HgstNc2mQcQVvj+HnD/kRLV4S1j4hb3dPOtP0djnNegJj5JVnqazvT9BV0UPjdpmzQINvaXB0tx0VrCN41B0P1YGF+9D7KXHArxo1moEg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0160.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:323::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 22:23:11 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::9d42:7b4f:71ef:c76a]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::9d42:7b4f:71ef:c76a%3]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 22:23:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Sep 2023 00:17:32 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [XBqpkAZ3VHL437wK48VmFUfClAeo1H2R] X-ClientProxiedBy: FR3P281CA0019.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230926221732.3711507-60-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0160:EE_ X-MS-Office365-Filtering-Correlation-Id: fd1bc0b6-1122-43f2-3fb1-08dbbedf2b26 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dcwqe0MWvDvwEljecxZHv65PHnDk/HBotQ9FqRrZmlQWNDGOJMQnRD7gt0b9GRhEBsusCE5m/qRyvWLNzhHHL86sb295MMMxE0ofrFHBe4auRFIJoC/W4Nr1n4/iYXofmaprwlq7uywX++Mb4Qg/5UPU/TZYqinTWRIEDndMj0ikFPdaxUsXkzGOtbOjQVB6GV8Ze1Umc4c5y2vI0LJA0NEAs95Z6IW+scf7Rg/Qu4+fieLl4NFhhh/ba6hjO4GKO/ggKwd0GXo7vE6lwyMTsCjGN44xAhbSep63+2k33fNhAfWQZukP2Po/GPaHV32sz4OEaRD5mWS0YXn/uJIdJBBSYiYiJ0yydSX7VKstnkGDklHbEd+3tqAAJ/7t9OzTh0BkJ+TWuJP2UeVQu32tvt7Y593VHedca90b2UL7kQgIT/LNEhNmdVVUct9sFnCBOh4BhJ3xCo+TzbioK5u9Gh8X5KyTbfB3sehyxulVjzgJ0lohmEkoI/f9f4cYUrjJTsbJvBx8Xq8gr8xdUfYQuTAT3HPlW/jaTysjy6mDdC8BogvccTBsasproymjR2MK2P8mPFTPNHTaifAEh3/SxjCP26nNeF/b3vRy0gZBYRQy1SIqQX6kdVBZM0j9sDZt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: b4xKCEJN6AZxzDEnSMkHDvHXrkb8tAWddP43r6SbXitwcj+2K3N51/lod/xvcMgJgt3PawitWXKSdYUAc7dtnIui6wK7Q2V2ERyUPr9vrVP+ipBxJ9eXTzXQgCbLNagZjWCwlGKRgRVUPpIc6kyJHOngz0Qhgylx98ACH7kYIlbUfSwg49WHKwjjBQ80yGVyA1EgGpIxJpUNiqYKGJej7ina/l+81Sg51qa2XBuzxfB0XKDq0DHxPYugM5dnn5y1BCV7/42JIeX60/1eRgrO2qgiiwb+UJc0WZGSfT0PulbXzeXT/NehCEpIc0EcCkAWmyzOpurVk21x2fqYs5AoeFGMVOfqUzytYgorLDrz5sIgjr569Mxo+UuwInijguZzCAgwHNFTiK7aLhKxR/2eIw1kxKI9oOHlk5UAUfujiBrJgpa7bLh1diHdfSPIvPp7Lvmbyh0NlkOk8Q9nkAgUNykMmapDixgw8oFoctj6UrF9xsgBrWJw85RQiQE37HABwJTYHO7lhxVByj779PxQqElDtY+cHQh25thdo3FQeObRLcuiziszMiM88SuTnmHrivmSN9WHpCHqpIwz+K3nSbDlpoCB4P4+uIkWSW4UFkuc35WWZa3M/ok8eN2uAUn80dRRReP6e+GyCLnlyFxZJIf9n/eey1uVDjJl3veT3Rbaffx1GhYOvgXuKMZS3d7PUFPzHpqmPSIuqIoLq7YTstliRz1WKOS9hkwwigPM4hGeciglk6/csGvidHL0cyVvxEgydFhiHN1mdT4LWmOT24tYHr8bKKCdGj1QZonnY+0yF9d+SwchhDKO0P47c46x/wPg2hY8rB9GcrRJkRzx6RxseAG83EG+RIjZqKHm0zxfp6qcf+fiqBZzEFUjjQEoOViEeykWktlsIMuDH5r/MxDYodH48x80vSv6fdL9OxHhQqtyDVN+Fv3WRdCTREaCzzyAIe67RqgNrcrUhjVjwhq1oDwJ/rVuwxy55UHaUGHTuEPLhkiSDD/NKnY49qKGH2qaPOCfcsdQ8SIC/u23Sl7rd9/FBTdPKeNIVR+iQltj+ZgpQoLZ8jrjDihc1ItEpdjZYW3m4zgJL9kpEsYNZTCQA7fPzmEW6sT6h1awVLSqISqH0E5P2WNOMOYhGnvrwjjTVL5sr0k/DgGg1PIW5ys09/ZB7MW8eWgJTfauZWBgwr3h8iZH4ZURKxFKIdbdS/GNEdwJHfg27rVVO90NJOWe68t+TM1aiG2Z27frkdRS3pc5JGRDkQI8fHN2h1yK X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd1bc0b6-1122-43f2-3fb1-08dbbedf2b26 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 22:23:11.6274 (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: AM8P250MB0160 Subject: [FFmpeg-devel] [PATCH 61/61] avcodec/vlc: Remove unused macros 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: GIKpjJsfnXo8 Signed-off-by: Andreas Rheinhardt --- libavcodec/vlc.h | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/libavcodec/vlc.h b/libavcodec/vlc.h index 679666801a..0cc106c499 100644 --- a/libavcodec/vlc.h +++ b/libavcodec/vlc.h @@ -185,47 +185,6 @@ void ff_vlc_free(VLC *vlc); #define VLC_INIT_OUTPUT_LE 8 #define VLC_INIT_LE (VLC_INIT_INPUT_LE | VLC_INIT_OUTPUT_LE) -#define VLC_INIT_CUSTOM_SPARSE_STATIC(vlc, bits, a, b, c, d, e, f, g, \ - h, i, j, flags, static_size) \ - do { \ - static VLCElem table[static_size]; \ - (vlc)->table = table; \ - (vlc)->table_allocated = static_size; \ - ff_vlc_init_sparse(vlc, bits, a, b, c, d, e, f, g, h, i, j, \ - flags | VLC_INIT_USE_STATIC); \ - } while (0) - -#define VLC_INIT_SPARSE_STATIC(vlc, bits, a, b, c, d, e, f, g, h, i, j, static_size) \ - VLC_INIT_CUSTOM_SPARSE_STATIC(vlc, bits, a, b, c, d, e, f, g, \ - h, i, j, 0, static_size) - -#define VLC_INIT_LE_SPARSE_STATIC(vlc, bits, a, b, c, d, e, f, g, h, i, j, static_size) \ - VLC_INIT_CUSTOM_SPARSE_STATIC(vlc, bits, a, b, c, d, e, f, g, \ - h, i, j, VLC_INIT_LE, static_size) - -#define VLC_INIT_CUSTOM_STATIC(vlc, bits, a, b, c, d, e, f, g, flags, static_size) \ - VLC_INIT_CUSTOM_SPARSE_STATIC(vlc, bits, a, b, c, d, e, f, g, \ - NULL, 0, 0, flags, static_size) - -#define VLC_INIT_STATIC(vlc, bits, a, b, c, d, e, f, g, static_size) \ - VLC_INIT_SPARSE_STATIC(vlc, bits, a, b, c, d, e, f, g, NULL, 0, 0, static_size) - -#define VLC_INIT_LE_STATIC(vlc, bits, a, b, c, d, e, f, g, static_size) \ - VLC_INIT_LE_SPARSE_STATIC(vlc, bits, a, b, c, d, e, f, g, NULL, 0, 0, static_size) - -#define VLC_INIT_STATIC_FROM_LENGTHS(vlc, bits, nb_codes, lens, len_wrap, \ - symbols, symbols_wrap, symbols_size, \ - offset, flags, static_size) \ - do { \ - static VLCElem table[static_size]; \ - (vlc)->table = table; \ - (vlc)->table_allocated = static_size; \ - ff_vlc_init_from_lengths(vlc, bits, nb_codes, lens, len_wrap, \ - symbols, symbols_wrap, symbols_size, \ - offset, flags | VLC_INIT_USE_STATIC, \ - NULL); \ - } while (0) - /** * For static VLCs, the number of bits can often be hardcoded * at each get_vlc2() callsite. Then using a full VLC would be uneconomical,