From patchwork Sun Oct 23 19:36:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38931 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1860299pzb; Sun, 23 Oct 2022 12:38:08 -0700 (PDT) X-Google-Smtp-Source: AMsMyM77E4z3Syd+Aw3axCXv5o3lNbU+5hJ2XNA+ukIOplfO75yEKm4HiH26tcV4ruTrcjsZfuQA X-Received: by 2002:a17:906:9bca:b0:78d:bc5a:9137 with SMTP id de10-20020a1709069bca00b0078dbc5a9137mr25832566ejc.25.1666553887706; Sun, 23 Oct 2022 12:38:07 -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 qw20-20020a1709066a1400b0078dad5e8d65si22777037ejc.68.2022.10.23.12.38.06; Sun, 23 Oct 2022 12:38:07 -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=OxdYnNlF; 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 86FC568BD78; Sun, 23 Oct 2022 22:36:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2086.outbound.protection.outlook.com [40.92.49.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC9F268BD15 for ; Sun, 23 Oct 2022 22:36:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G+7y58MmXRKNfY1a6sV7/dQ+U6VKbMkAVqSMhX0YNwWYVp/bv+b8+QGbxbAxwIMPnIVngMVmAktsarnfVZdaRRNfs57dcCdOxSXNfLC63I9w7sa3HqeSRBNvpciI2nM4c6I1xljkDXHVrf/btKPUSWx0xs+KPhPNp0VhRxoUpIXQD5KlJVlfnEW7pxTPxEQK+jsbjX6WH04UYBPAmeDKSDHhuSwKF0uens0+TBRmr+WZkRqbdC8wvi2Jwd2UqFpsUmYV/T0FrCDeZcyRhktzzz0JQdVVDI67HtdBX3WgXPtn4mj8qOlmOTLlcwfNMjNdhYKn3UIcb6R7+SvMO5xAxA== 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=52CG2XJVeVw2dFV/GFj/o+8c7kH7zDc/xwEo5PXxGhw=; b=GBh4pr9WKguyTHAEw8hR8uIEzxitGyLySPBl9a79Qb84mhfP25Sd0xW+E0SfwXmhj/X01K9FuKRrawvFAVa+/RX+/Jy5TTV2NiMsg8Z/RmlTjy+VtzWDyx3SDx5Ww/E11u3HnvvWgyDPx593yUjd+dOHgkDquFcnCriIMaI//2YVFFPxzSccY/z3xoaweR7IOGFvq4RXZ2tOVfGcjy3HxuwJspsPSeWBbH8sURCqN0mz+u9COvPI93aUUvoGjejSkrqeef2+pTqBNlYJgHgqhKiBs/WbzRaE12BgXMoi9KoSz5vMYp179I+z/wHIo8IfRPP2AnHJCaC7BM0UdVJe2A== 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=52CG2XJVeVw2dFV/GFj/o+8c7kH7zDc/xwEo5PXxGhw=; b=OxdYnNlFe4JCaAP3ydfFgNdPTKO/pQgE4AL06vqozlebSApKwUvCiYN2ZYCcEMqxi8e/RpyHGWzhOjCSyAXfYI4dbPf7kOBesbENvmz49Ywe3Wgoc2xs7XZV6LMqmAE6ddtD0mF8ag8N3wG0Q0Bg8A++yVmda83rXgQiACFLUezwak886dSX/tJZhGnpbdhdg+jWaJfafGO7ort5LKruXEuwEiV1anzsyLL5siVrmCx1PODr2KwbyMKQASg5+xePpyJopfDBvthr9MsI5glouQr6yyNCfkdCmVvtYYDCNZ16ZZV+ORu1Tc0RTWmxx/J0uTEasZvEAHa6YN6jb+2kVA== 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.5723.29; Sun, 23 Oct 2022 19:36:25 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Sun, 23 Oct 2022 19:36:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Oct 2022 21:36:08 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [EUDaI7Qu+4tJ/n7rdSNfosYZTfc9EaEnkekKQrcAKtw=] X-ClientProxiedBy: FR3P281CA0032.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221023193610.674990-14-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: 61982535-f57c-4ad3-8129-08dab52ddf5c X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKwtuNlcRaDgURFx8jVPoKbRQ8tdqtjxRumv5sVb/J1/vgKTtIQNJnxKjm5PNFfxLxrCMSBmsA9RxcWELzvkblK1q2VNyN4K8kXk3DLPwx2ypY9gUpSGUDEjErN90w404FjX+ckgPloLeJLoyBqQ9T2NmwRZiOdgrAiNINhxS9Tv6TBearzZIt3M/eMWQo2OSk9GQKLt1CsAaryVp97gUnb2/T5gYgfEHTvPWaNMcJqr3R7eT2vZ+DRYD518eEQ/ngA3R3gB0W9TaTuVZvFKZtv9nR6YcbA1LhVRSmvuRCNJ+bT6RidH4QVY0co8FyNr4wo4mdaNbR80cmpDCB/uqbDVHiO1bOc6LkBB40RgKKKW9AsPzRPeGc7d6FLzvyBd7NyuRhDDRK98ovmgPQ0kduBrVqKghjKMXuuvmGOg+m1Fab0byPJs2tDeLFQwoCC9hsp1Q0zNhn8Cr4T7pxbMY7wpk4eUBYuKL/2Any3XAs4RmSq02Z8tHmETTat7XsyfpOjVe2bu83x5ZekL4uvJEnUYWl/LNXsSj5DSmT5jRPqgCEjlydFEnglyi4S7Lslvy5Bfx7Zy/rlaNDmrLMuJRBSjD8JbDj7/PxiqF69ONoksa8B0+0IWenpqjEGT72EsGnyRDN1lu/TVRO9RVMjY9Z9pFaplzehlmf9S+SvKm7/BLjB3S/R5LRXNsF3JvZz/4wGtNycpfjKLCOJOhlNxrjpBbDzRRBXwHxM= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nAlZSvc228vpmdKm1HseWSgCW7eutveozCMx2lwn7ERX4/eKkthh3rjD6gMdMuABWluqKacIhIxM6cqkSZZHGTJpoW/rR11i14YKPj9F20tNvTKVs0cQLx27yv/WCJlW0c/V4LH6wSh+DydzJi8ANX/JpZVJv16d8fmXGlqee2mop79JYqn20wFnK4yt/oUpd933+OIt++rqllAGR4g6OoiwGtALHI1WIrPymXql3k3RzBj4hF19NOYJjpvayBmjP26AjiHRVTFLWZWrGZ/lf+UV3ZoN7O+vzIUNaM3f+TTddUme5Z+4FkCpLv3/sRKmVFBh0IbrQcVoXsR+Iq9mkpQcUtleO+WB5Tx/k/F1u+RxQ0rI4D+QGCruBQr6XHXPAhCyrGzGEqych8c7hCaUkAIaUH15UErXm+upeyFO2X5k5wNJfqRGQwB4ZPuAP8ZGOlzSlQZVi/4iUml/L7Uf1Nros8td1FmwUiqtVZntlgNDjYGYcRbvA9l3q6pE4NjPezI8R1YHPBx1bvCiNmSzQtKM9ZYpaKuqOPlKvQ7WADFMwElHeAA2tKDs5Q8fXdB6nWLPfZ082C+AWa9MZrb2Ek2Mzr3Mv9O5IGeOOsOFIy9Hq4Fb7ii0T3nSx4rpK8QTpsVABpSME1v0CeJygkKfep+8x5qE4PWSJaBncCcf/pdFyCYOSbO7C0mqPjpZX3EE X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lanCh7RQAuAPHZARgnuuB9RupYm28pAcVwRMYYK8NzA+XB6MAyFtxV4068/s0WoQvRNJP498N4sMu1GYysjVQ+h39F+lUTPZtNmYwUcHDgNth0hmCb76ze6AqR1NR2TgSeF35vOy5Yx66KLJnefuPbMaziwbJGG5Gam46RXM/eqdFkqw02ZQufcRwUx1JJUhcKUhJrlNPHdXdOIeZ7uhMHTaZzX0aZx6RVg1J/R4KtMKv4hMrJIeSQ+dFasJ02+6YHZePa70REdBEYtBRR9bDcnfyPVbAXWILTur3Lxhtroq9iJUKYPXgQmUHq/XY3ZsvZxnnvjjHSJJ1HUP6BUX4ba9aLeHdPTJIOxWWhMZRgoe8lNbZ8cdyPus63S5FFTDu2w0TwUZDz8VAohzWhkTLmZxKHmYO1l0NiwvFKkPDErJ2yp2VdEIdinSin9pYVyaOq5P3q5MlLwxw1LTazU1PJAKEliNuGVfRaYZdS6cYDmp8Pe8FJX+K7Xwwy240OZ8RAZfE/LnVgK9GkcWasOepywuRgqd05/8Ji4VHdJO9g5oWzoYD6EXTUAOSmCQZaRqKYHCCKAImjI71bY0u8EoPEtK7edP5Z+0LYMkFOixrAtP19ZOjY4PXyMlmut49GqylAMTXesmUvV62yiretKhEjh6rEmx3WbvxaQDeWujpyC3/Y6JMzVKYeMUnbVDCqE90teWRFbBnyiWbNXRSs4DLy5G0vdVlAIdss2wRZTaMZLAINhpIcWB6f0tOa0VeQdTV5XmyltX2SiDbAr8WkBmPIXv8wvzdYd6RjJfx0f8JYeLbVVZhP+flCiRWEFZHak17Q9RPv5EDhd8R2qWc29U6+cPdbhR4/ffVgiyP9HumszpUZ3MogCfis5fsoRCqZQweNC4nXlxihVF1VTOgT6CvfDnvpsAeqW99AVrZAovRU4M9DQFdHB6qhTIQY0ohowmPujYMBDFGqS648omTLczR+5iIWjdKmt0rm1nhb2C77ePlIsp608fXkVttBejBN9APtDhemo0n6+64htF8YOXb5tB34EMh1o6Y1pywsXUCwIeiWsRuInf7wTI6vxq37ibsUzI9lVXOUlsZqhiltKwnDi+TP+oS7CGdUE0oI0uXQFhi6CPBiVHhySejBnFyNrC9BfyCzpZS1HfyiVqDz+0hredzDiY1m2pesBBx7iR6j4Qbhk+KG3tREJahzkVHTgn3ujY4/CAMD9UXNXU25OqRLQgUTdRydYInobl+XWbvicPWhVK91npgW6Q5NqP23oTRZrC3zEy+kPvv9l4OTdgswR0FldGRXginA5hMaI2b7ltT/0jxAExYs7jtChnPGm5 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 61982535-f57c-4ad3-8129-08dab52ddf5c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Oct 2022 19:36:25.3602 (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 15/17] avcodec/mpeg12data: Remove ff_rl_mpeg1 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: Gi2QbiC+0R8F No longer used anywhere. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12.c | 1 + libavcodec/mpeg12data.c | 8 -------- libavcodec/mpeg12vlc.h | 3 --- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index b0e638bfcd..5d5f39388f 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -37,6 +37,7 @@ #include "mpeg12codecs.h" #include "mpeg12data.h" #include "mpeg12dec.h" +#include "rl.h" #include "startcode.h" static const uint8_t table_mb_ptype[7][2] = { diff --git a/libavcodec/mpeg12data.c b/libavcodec/mpeg12data.c index 1e3410bf2f..a55fa463a4 100644 --- a/libavcodec/mpeg12data.c +++ b/libavcodec/mpeg12data.c @@ -164,14 +164,6 @@ const int8_t ff_mpeg12_run[MPEG12_RL_NB_ELEMS] = { 25, 26, 27, 28, 29, 30, 31, }; -RLTable ff_rl_mpeg1 = { - 111, - 111, - ff_mpeg1_vlc_table, - ff_mpeg12_run, - ff_mpeg12_level, -}; - const uint8_t ff_mpeg12_mbAddrIncrTable[36][2] = { {0x1, 1}, {0x3, 3}, diff --git a/libavcodec/mpeg12vlc.h b/libavcodec/mpeg12vlc.h index 15275c5269..3ed35968f6 100644 --- a/libavcodec/mpeg12vlc.h +++ b/libavcodec/mpeg12vlc.h @@ -28,7 +28,6 @@ #ifndef AVCODEC_MPEG12VLC_H #define AVCODEC_MPEG12VLC_H -#include "rl.h" #include "vlc.h" #define DC_VLC_BITS 9 @@ -52,8 +51,6 @@ void ff_mpeg12_init_vlcs(void); #define MPEG12_RL_NB_ELEMS 111 -extern RLTable ff_rl_mpeg1; - extern const int8_t ff_mpeg12_level[MPEG12_RL_NB_ELEMS]; extern const int8_t ff_mpeg12_run[MPEG12_RL_NB_ELEMS];