From patchwork Sun Sep 4 21:58:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37656 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2274622pzh; Sun, 4 Sep 2022 14:59:26 -0700 (PDT) X-Google-Smtp-Source: AA6agR7pTS2yLW3eBarYHgr0P2POnLeNKPs0DHHJF6BrZtTakfBUnvm3diNcXD4/p02Blfpp0srH X-Received: by 2002:a05:6402:2744:b0:448:8488:9857 with SMTP id z4-20020a056402274400b0044884889857mr26971039edd.324.1662328766114; Sun, 04 Sep 2022 14:59:26 -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 qw29-20020a1709066a1d00b0073d82c96367si6147300ejc.360.2022.09.04.14.59.25; Sun, 04 Sep 2022 14:59:26 -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=Q5TEMl0O; 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 6F46C68B96F; Mon, 5 Sep 2022 00:59:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069055.outbound.protection.outlook.com [40.92.69.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA80C68B898 for ; Mon, 5 Sep 2022 00:59:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bJ3N3S/R0SHGrevoBnrsRc1zC3es1gT4PX/4LC1efWjhWqrkmR1Sscee/NXf+21QWMUA8722KoYs5txXYV4EeZwYtD2VBdfynDPwhZEiXEQUt+5eqebZIJly/yN7uuy+IhJlQM4ku7i79Bn2ilCNQVBwScSl0JKDghASl89Q8mdZaV5O7UF1QtVgDLxCM7R5Wqg7g+efnL+NIlex+aGiFg5n22fMaKWTwwZSdxAUE/o9rKSlYpNShgaI/5g/TOT6mn/bG3yjm4QKNlpwm53Mcb4vzf9MehtIGZ7drpg6VFfe78YhWnXl0zjaHHZ0ARegWEHHzOGnTRqGXc62OnSeQA== 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=Fgyl1cUHiGTDC2OIn2iS8MimLlW4Zs7cvSqZCVYiig8=; b=CI0M01qPYBPaZTVLqVGCDXB5f+Sb/+UJCA8WE7xOVKoXzWyTK0Pi6VYpZBFT+QgDaJexn8apyfovhMpnCWOl5yUAWlWTtjYaUdOaMRLmeDDHocukhJDWCNCADbG6LodYztXvm0DbNBVjlTZK7A47iE42kRO0YmsYvIksivohRB8i0cX31ZgLJ37CG9poI2QlJQvdbCs/PtVaODl7j/+e1QOUZGcqntTa+7lFPJKsK065njdzm2iOXwIowFkwpKGSwUUU7zfEiXuhwi9hxmRtqoR/LSs4AsXNwSyX/0zGWn0umL0ltHAGjlt45hXjMyP5uLgp5KAdg0I93ByYKxEvnw== 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=Fgyl1cUHiGTDC2OIn2iS8MimLlW4Zs7cvSqZCVYiig8=; b=Q5TEMl0O4D/OlqIHFFmHt+lQxnoXdNZ78vC7mh1yVNY1Fh4buGBnT0chn6VpSAZoObefi9Jd5b5CQxyK5/mJzay1UQSgPoWT13Pj5NUXy0uUjJ4SKor0fjlBl9hAKluwxf/bZHj6+NCe5SUmceoMwqNEIG3wYMEZtNOzgH/WZ2P7RtB4vTLOM+KzkSDJ77e0j+C0gIYz7WF7D9pSGvkojk2JMJdzRKhdmNmkX8On5iPEbbyDFYsR3lgnRVAbmjN0VY01SaCyajd2xEM1azJEO6WDIBHzbhBIWlmQPaTBbT+zwKmsT0v1O0BX1QBuuZSvL5het9mfLeD3w+mtf+t1tA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0746.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3ca::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.15; Sun, 4 Sep 2022 21:59:14 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f85a:9a02:f8be:7c47]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f85a:9a02:f8be:7c47%2]) with mapi id 15.20.5588.010; Sun, 4 Sep 2022 21:59:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Sep 2022 23:58:45 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [nh9qpzB1F25/rbXVf3hHzuKoOImoiuCjcuILHAX5FXU=] X-ClientProxiedBy: ZR0P278CA0037.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220904215851.4164981-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fd79305f-4647-4236-dab5-08da8ec0b4d2 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKyWpuw8QwNKb6G2Lo6Ie5VppVUPywKuP7ZWeUrQpp0DW+VCDZaEcHeDK7GMzGCherIeD9vyNmN2x8xJujgpEdRjLFiYOai3knChlLlO1fmR5oz4T5FQlcWh0yv7fuq2eKosmee0j5vbUMgYDBB7PAHz8+nm7Etbrl0191jFRM+yF3uAf7XtqcAoL2AnYZ1z/XAb2VY+ua+rd9xAX0DXFg+Zu34YRVaZ+HD+MpR1Rn/6XXFxDAjNBJWmlWxuGAgj8v0g8VKyJcw3RwIu2D0uyfOQBTP0U9xPgXwl6LWSofWGqvxb7UvDgiKlHq/EuvtSwluXRenUtPZ1XBGrEYbffdjagCjpzcWiQ9M5J9xNkcCz2mrxCuBr595PGFujqqtpSKsWPF8M4z8WpcwjoxCxj4b7oEb/hROOtbQGn2ArEbkrsqpwBwkjux8i4UJsUya5102MfHZv+kCJzY1GnbypusyxfOmSedaXnM6KlqLx6IOlcA0LXxWeuY/LXb90HGDWZ5O7bQn8Z7zTkQqC7jV2+u96CtTR0BbMYLtcPsgGBgsthpBOQnASK1i2hOJz6aUSYsOaZNWuBQeqfZieOv8Ye8KoQr4QZR5SBSJ20GgmtkbA6bABFRK27657qAVQe39sa7yueJIL0atjv+49UUmhbubIBwSgf0YsaZh2qHbbjfl6EKbr+/J2Bq39nXzyJ70FuGvu6y8spu1XHRoFtlzJahEuzS1w+V90E5Q= X-MS-TrafficTypeDiagnostic: DU0P250MB0746:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DHNtVmZ51lNaZdw/H0/f69Rg8kCpLXD73N0tVJwj0XjvZIRcIM3yUQYdIz7qBGH2gpTNwpUapm2nndH5F0qMYreVYsmm6+z1XarTqqDPnJJu6MKVzLBTmPMmD2CjIDxvYBFYmENZ4DgYvjhKn19KFUxqdBE3A88Zj5t06XKVcoBh8SVaz3xTN5XbxexBIjgPAYzKx488s/IgreteUCDQxvFYcNSVQa4iNuxbBhRtGJJT3YfyDhPEPcTUyY4E+O9EesJCz7Q/vmOZfjsoK4KcArX/lWKiXsyZDXDD73AppSliWYxbwf6i3SLVq8+/Fl+WO9yndBfjwic7ql+6E9dh8R2KbzNN5Q/gnCpn+kYvyYoI3D55aY8LMRxC5cMcmU3w4uaWAGWlIy6fS8PklZt458bkwWwZqUsnCpdWnLRsq2Md5PRhh34HzHqwT1DCG32ceIQU+QT575zxX4Cl4KCM2EV6kVK8FiYhc5KnQCcBtyo/Ex6XwIC5I2UD+6MDgkwkMkZYcthT+/1/eysSKTnBxaElNK35vuapsD2kMM319+qVegEYEATB5ma0lSo2/CtYDNL8fXXK9P1aIumns/8OnMbjvwRxY90l3ScBq0w0NQ/49/Eh0Ce71dDLUjaHepGAfShya0R6Sa8lpBOiIOce/A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KH7TZap88jLWLiLLLWIb2/jc4FwjkSbPwXH6vzQGKhjkNVLV7WAOxoVM1k/dvwYtJn+zHN1qbxQUQk+GMpgZSaZ6SJ6YT7WGscYrk6sKqMM3sIVqnnaAh2CDrS9CO4TWakToc5TQyv7UejHBSrkAZI6AXVsJUOmFYMliTYQ+hQAI3xdQDIQaJ+MCkMzOjhpMWDCDA1BWeTgPPmKXB1iSsqCE70H4S7CQLaL3OkQHWQQgHrufnbJhVA/zpLp6v0dfw0wceQ1+/ufz2swSEW7M7BvpqxRrw/mobwn0bMQN2dj9OiDB6vmlMSgoB7TV6v/f+UrJ+3oPZ2oyXJojcnSm5TbND8L4m/UzmsNin00RD24cBnhk16P0bgwDofoSzVpU3Q3FPtlcZ0oZ8qJWYDWs3UVKE7tS8P+dBsYZkBhmmno+n9Z7wAU0vepQq/WFv4Stlu45G0XQAg4KUpqKAR0A6+r0pB747CXR1sYRaLNXzb8lXc68XL6pPvEJfQV3Ur5p/kw2gWnt6vFaFzS2BY+a9ClF2SgGUNlynM/He0Q1Mf53IKaTDy/WGvb1TD1hW6INfRrWpy6sNaakqL5XkXTBX1a1YLm/+qxpVuf57XrPRqbwsIwE/iNdJ7o10+rZ6PQu4ZZmlte9GJbqMXUbeeiJYgcigVNrhB6IBa6KijMeVhs1/vY5GVarcAhqNFN0jTD1gqZ0k53OqDY5Cbef4zkOUk0Z/gJ+MyNNGrLXTxNahbyxZDRy6XQOiiaeDLS1KWQKIKL0gbQV7Qtn3dXo20HBWfkACFxUlf6SxpS4zUYTr+cOtfz2fMJZ0PXlObUSzpmkoxpge7LMih9eMsNqiUKVbvwoXL6a4wdJWGprGpr3gy0qro0KsQqU3bp7rG4zEUEIpBcNX06NrLgYdQhFZe7fIxJ/fXQL8RD8162B4KsSwzkiichRAhVzglTq6iy9C3RltM/hKBJtIs9n1aMxEzPGAtf0NB52E2KVWV/Ad2c5zvOAPuEdkWWFKSPU/JwJYVRchDH8hpObRHyEGv48WUiUkOZCVPejjr3kuDmekX3JHPYffvmTBfT533zdz+DkO4L+O1V36CAcz0X2RAQ9xj3UMl1DZP6cUnW8joEqiGbszRPSZ4RGnhzEJD+7LB875b1BkpPoeNWmqW47s3Fo3UoOnAxzGLYL7kBciVcRIWRaolnj6lw0SWYYQsLmr7T9xm9C5NDZLUqBcq1RPqukzxd28VYfYXj8fLLAVgkXr8NzSIPw6+Cjk3hYfKB9PRV7meB/IgRBUp5VQBDjGH6H/YsZqCjcCwHzvJHuE5hzG1+GRsDSALS1y4CL+wiQLsc1iQB/ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd79305f-4647-4236-dab5-08da8ec0b4d2 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2022 21:59:14.7115 (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: DU0P250MB0746 Subject: [FFmpeg-devel] [PATCH 3/9] avcodec/dv_tablegen, dvdata: Remove ff_dv_vlc_bits 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: vA1YjA2zbUCa The codes can be easily calculated, so the table is unnecessary. Signed-off-by: Andreas Rheinhardt --- libavcodec/dv_tablegen.h | 5 +++- libavcodec/dvdata.c | 54 ---------------------------------------- libavcodec/dvdata.h | 1 - 3 files changed, 4 insertions(+), 56 deletions(-) diff --git a/libavcodec/dv_tablegen.h b/libavcodec/dv_tablegen.h index 0dcfffc140..7f0ab53fa7 100644 --- a/libavcodec/dv_tablegen.h +++ b/libavcodec/dv_tablegen.h @@ -50,8 +50,11 @@ static struct dv_vlc_pair dv_vlc_map[DV_VLC_MAP_RUN_SIZE][DV_VLC_MAP_LEV_SIZE]; static av_cold void dv_vlc_map_tableinit(void) { + uint32_t code = 0; int i, j; for (int i = 0; i < NB_DV_VLC; i++) { + uint32_t cur_code = code >> (32 - ff_dv_vlc_len[i]); + code += 1U << (32 - ff_dv_vlc_len[i]); if (ff_dv_vlc_run[i] >= DV_VLC_MAP_RUN_SIZE) continue; #if CONFIG_SMALL @@ -63,7 +66,7 @@ static av_cold void dv_vlc_map_tableinit(void) continue; dv_vlc_map[ff_dv_vlc_run[i]][ff_dv_vlc_level[i]].vlc = - ff_dv_vlc_bits[i] << (!!ff_dv_vlc_level[i]); + cur_code << (!!ff_dv_vlc_level[i]); dv_vlc_map[ff_dv_vlc_run[i]][ff_dv_vlc_level[i]].size = ff_dv_vlc_len[i] + (!!ff_dv_vlc_level[i]); } diff --git a/libavcodec/dvdata.c b/libavcodec/dvdata.c index 1e48db591d..0cd10aed10 100644 --- a/libavcodec/dvdata.c +++ b/libavcodec/dvdata.c @@ -74,60 +74,6 @@ const uint8_t ff_dv_quant_offset[4] = { 6, 3, 0, 1 }; * between (run, level) and vlc is not 1-1. So you have to watch out for that * when building misc. tables. E.g. (1, 0) can be either 0x7cf or 0x1f82. */ -const uint16_t ff_dv_vlc_bits[NB_DV_VLC] = { - 0x0000, 0x0002, 0x0006, 0x0007, 0x0008, 0x0009, 0x0014, 0x0015, 0x0016, - 0x0017, 0x0030, 0x0031, 0x0032, 0x0033, 0x0068, 0x0069, 0x006a, - 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x00e0, 0x00e1, 0x00e2, - 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 0x00e8, 0x00e9, 0x00ea, - 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef, 0x01e0, 0x01e1, 0x01e2, - 0x01e3, 0x01e4, 0x01e5, 0x01e6, 0x01e7, 0x01e8, 0x01e9, 0x01ea, - 0x01eb, 0x01ec, 0x01ed, 0x01ee, 0x01ef, 0x03e0, 0x03e1, 0x03e2, - 0x03e3, 0x03e4, 0x03e5, 0x03e6, 0x07ce, 0x07cf, 0x07d0, 0x07d1, - 0x07d2, 0x07d3, 0x07d4, 0x07d5, 0x0fac, 0x0fad, 0x0fae, 0x0faf, - 0x0fb0, 0x0fb1, 0x0fb2, 0x0fb3, 0x0fb4, 0x0fb5, 0x0fb6, 0x0fb7, - 0x0fb8, 0x0fb9, 0x0fba, 0x0fbb, 0x0fbc, 0x0fbd, 0x0fbe, 0x0fbf, - 0x1f80, 0x1f81, 0x1f82, 0x1f83, 0x1f84, 0x1f85, 0x1f86, 0x1f87, - 0x1f88, 0x1f89, 0x1f8a, 0x1f8b, 0x1f8c, 0x1f8d, 0x1f8e, 0x1f8f, - 0x1f90, 0x1f91, 0x1f92, 0x1f93, 0x1f94, 0x1f95, 0x1f96, 0x1f97, - 0x1f98, 0x1f99, 0x1f9a, 0x1f9b, 0x1f9c, 0x1f9d, 0x1f9e, 0x1f9f, - 0x1fa0, 0x1fa1, 0x1fa2, 0x1fa3, 0x1fa4, 0x1fa5, 0x1fa6, 0x1fa7, - 0x1fa8, 0x1fa9, 0x1faa, 0x1fab, 0x1fac, 0x1fad, 0x1fae, 0x1faf, - 0x1fb0, 0x1fb1, 0x1fb2, 0x1fb3, 0x1fb4, 0x1fb5, 0x1fb6, 0x1fb7, - 0x1fb8, 0x1fb9, 0x1fba, 0x1fbb, 0x1fbc, 0x1fbd, 0x1fbe, 0x1fbf, - 0x7f00, 0x7f01, 0x7f02, 0x7f03, 0x7f04, 0x7f05, 0x7f06, 0x7f07, - 0x7f08, 0x7f09, 0x7f0a, 0x7f0b, 0x7f0c, 0x7f0d, 0x7f0e, 0x7f0f, - 0x7f10, 0x7f11, 0x7f12, 0x7f13, 0x7f14, 0x7f15, 0x7f16, 0x7f17, - 0x7f18, 0x7f19, 0x7f1a, 0x7f1b, 0x7f1c, 0x7f1d, 0x7f1e, 0x7f1f, - 0x7f20, 0x7f21, 0x7f22, 0x7f23, 0x7f24, 0x7f25, 0x7f26, 0x7f27, - 0x7f28, 0x7f29, 0x7f2a, 0x7f2b, 0x7f2c, 0x7f2d, 0x7f2e, 0x7f2f, - 0x7f30, 0x7f31, 0x7f32, 0x7f33, 0x7f34, 0x7f35, 0x7f36, 0x7f37, - 0x7f38, 0x7f39, 0x7f3a, 0x7f3b, 0x7f3c, 0x7f3d, 0x7f3e, 0x7f3f, - 0x7f40, 0x7f41, 0x7f42, 0x7f43, 0x7f44, 0x7f45, 0x7f46, 0x7f47, - 0x7f48, 0x7f49, 0x7f4a, 0x7f4b, 0x7f4c, 0x7f4d, 0x7f4e, 0x7f4f, - 0x7f50, 0x7f51, 0x7f52, 0x7f53, 0x7f54, 0x7f55, 0x7f56, 0x7f57, - 0x7f58, 0x7f59, 0x7f5a, 0x7f5b, 0x7f5c, 0x7f5d, 0x7f5e, 0x7f5f, - 0x7f60, 0x7f61, 0x7f62, 0x7f63, 0x7f64, 0x7f65, 0x7f66, 0x7f67, - 0x7f68, 0x7f69, 0x7f6a, 0x7f6b, 0x7f6c, 0x7f6d, 0x7f6e, 0x7f6f, - 0x7f70, 0x7f71, 0x7f72, 0x7f73, 0x7f74, 0x7f75, 0x7f76, 0x7f77, - 0x7f78, 0x7f79, 0x7f7a, 0x7f7b, 0x7f7c, 0x7f7d, 0x7f7e, 0x7f7f, - 0x7f80, 0x7f81, 0x7f82, 0x7f83, 0x7f84, 0x7f85, 0x7f86, 0x7f87, - 0x7f88, 0x7f89, 0x7f8a, 0x7f8b, 0x7f8c, 0x7f8d, 0x7f8e, 0x7f8f, - 0x7f90, 0x7f91, 0x7f92, 0x7f93, 0x7f94, 0x7f95, 0x7f96, 0x7f97, - 0x7f98, 0x7f99, 0x7f9a, 0x7f9b, 0x7f9c, 0x7f9d, 0x7f9e, 0x7f9f, - 0x7fa0, 0x7fa1, 0x7fa2, 0x7fa3, 0x7fa4, 0x7fa5, 0x7fa6, 0x7fa7, - 0x7fa8, 0x7fa9, 0x7faa, 0x7fab, 0x7fac, 0x7fad, 0x7fae, 0x7faf, - 0x7fb0, 0x7fb1, 0x7fb2, 0x7fb3, 0x7fb4, 0x7fb5, 0x7fb6, 0x7fb7, - 0x7fb8, 0x7fb9, 0x7fba, 0x7fbb, 0x7fbc, 0x7fbd, 0x7fbe, 0x7fbf, - 0x7fc0, 0x7fc1, 0x7fc2, 0x7fc3, 0x7fc4, 0x7fc5, 0x7fc6, 0x7fc7, - 0x7fc8, 0x7fc9, 0x7fca, 0x7fcb, 0x7fcc, 0x7fcd, 0x7fce, 0x7fcf, - 0x7fd0, 0x7fd1, 0x7fd2, 0x7fd3, 0x7fd4, 0x7fd5, 0x7fd6, 0x7fd7, - 0x7fd8, 0x7fd9, 0x7fda, 0x7fdb, 0x7fdc, 0x7fdd, 0x7fde, 0x7fdf, - 0x7fe0, 0x7fe1, 0x7fe2, 0x7fe3, 0x7fe4, 0x7fe5, 0x7fe6, 0x7fe7, - 0x7fe8, 0x7fe9, 0x7fea, 0x7feb, 0x7fec, 0x7fed, 0x7fee, 0x7fef, - 0x7ff0, 0x7ff1, 0x7ff2, 0x7ff3, 0x7ff4, 0x7ff5, 0x7ff6, 0x7ff7, - 0x7ff8, 0x7ff9, 0x7ffa, 0x7ffb, 0x7ffc, 0x7ffd, 0x7ffe, 0x7fff, -}; - const uint8_t ff_dv_vlc_len[NB_DV_VLC] = { 2, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h index e0ed043c47..ae104096ad 100644 --- a/libavcodec/dvdata.h +++ b/libavcodec/dvdata.h @@ -28,7 +28,6 @@ extern const uint8_t ff_dv_quant_offset[4]; #define NB_DV_VLC 409 -extern const uint16_t ff_dv_vlc_bits[NB_DV_VLC]; extern const uint8_t ff_dv_vlc_len[NB_DV_VLC]; extern const uint8_t ff_dv_vlc_run[NB_DV_VLC]; extern const uint8_t ff_dv_vlc_level[NB_DV_VLC];