From patchwork Thu Apr 8 19:42:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26818 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 19C6844BA1D for ; Thu, 8 Apr 2021 22:43:02 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0980968A6EE; Thu, 8 Apr 2021 22:43:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-DB8-obe.outbound.protection.outlook.com (mail-db8eur06olkn2104.outbound.protection.outlook.com [40.92.51.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAD4368A5D7 for ; Thu, 8 Apr 2021 22:42:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yfu84JqQfTAAEbBgTyEB9UWABxqMkYHShSjmlycDjqgmZPWuCoOFziE8X++XKgBuxJWn1mC8DC7XHKqvv2yBmLwtpxw1P51EPM47bgQSSREVuVl0Q9fqzy2BgflQ5bH4DhL6qT7IGcc4WMRm2euzMBoHeLaBgwErE7Yf5AX9PZHQTt4UpwSOr39k0TuKq8rlcfq7VetogCrvDJeVUOvV38u7QWYMxQ3sEvDODbaFdRa5WqN0iExYsRiIAMQqvgvRtofld5aWqexCTwC1NqpFGjGaCS93hcXfCPgf/eff9oXrEnuZI3cpnn6pEyVLdg/tvKEUvhmC0nvTQFTJC4XKZg== 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-SenderADCheck; bh=1bLwmy677D+tGLrtbCi8VvguAjrhhIBQkwwcup+IQFM=; b=b2CRfiZKZUPyAB9F3eUgkC7WPDuVmmqO4RyN5tbpKAT7KQ5J7LguN5jElC9fPPOuM5tpvM0hWm947nHU0zpPeBssBOnlHiPS+uHtLPJPEeJ7tLzSO7pXmbKCEhn3rGLa366s9aclDgGgQwKxVZ6U1J4XMrGFGUKf7YTR6X7n9vTxZyuDzVr7TF7i/DENWIzTw1QTj/Mt8FXm11Mtl5Q9fQEU8t+nu5hh9Feks1Ad4vOazBZrHNe3yHnuixkDXH/Pglp99SPH0BvIGyKS+pdMSU/oHzCpE+IhfuRWkQFN/PfLmLBFbEb4VaoqMXMuVJ5livAsuRdjYQJeygVIg8OWxA== 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=1bLwmy677D+tGLrtbCi8VvguAjrhhIBQkwwcup+IQFM=; b=WRQ5/flujGTpVpcpwCzr+hN6dwgJkhYNB9FLW6NUx5SveIMrewF+qGpiqiiwvWHcfUZOf0U59qwkZOjrqhY408oVfWhX0xrBv6ats2YV0OQL0H+Nu8pqXvh4j1AbgUgDK6pjRhX2MZxbofKkKIBX6BzY2SboR7ANJEi5VLC2U72jsL29IIcGPfwUbOYdox0EdglvOCQoVv0PybOEgivIBySER1aqh8wHzgm/j2Z/ZOfb2yBlo+7/TgJI/EtagR+d10GsB2GyZqy/wKGP+IppjeHnueywsrdihIOLvMtMl3DodkDmrMKpCf451h+jGpFjW34D82lqc5ouH+DeBToxww== Received: from DB8EUR06FT049.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::42) by DB8EUR06HT123.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::246) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17; Thu, 8 Apr 2021 19:42:54 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::41) by DB8EUR06FT049.mail.protection.outlook.com (2a01:111:e400:fc35::84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Thu, 8 Apr 2021 19:42:54 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:25741D3E9BBD7C3951F5C96A75E859A204EFF7045EEFA73427201BEC7DBDC357; UpperCasedChecksum:810CC75114DC36073413B92C55D94B8B3A045B502E6D73D656ACC43AE7F16A2A; SizeAsReceived:7570; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.4020.018; Thu, 8 Apr 2021 19:42:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Apr 2021 21:42:19 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [VHALCeXSoKNeOsDpEdB4eRJgo9Nv8seY] X-ClientProxiedBy: AM0PR05CA0084.eurprd05.prod.outlook.com (2603:10a6:208:136::24) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210408194220.1242703-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0PR05CA0084.eurprd05.prod.outlook.com (2603:10a6:208:136::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.16 via Frontend Transport; Thu, 8 Apr 2021 19:42:54 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 129f2283-8fdb-4c87-cbb6-08d8fac680e3 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUUcF99Xf9jcMKqCiYf/T76QHn8h+sRj126Ob/hF8sUWKs9Drr7FWjlHac+jY8dIybv2WmIHGhEfwImdbqHEgw7KbrIHMW8SL+SiZ8NMjfE/yeZM2wNLCa3p0GlrRSy8WIkuKZ1ilmh4lFvKT3n2Hy/L5SRfh5TNmz9dhbKarceP/wYroa4pl8kXBAJ0e68+MCsFr37iVt+XaVxAu91FNd2bs20hHiPgMLmGgnPWZrDpPdpeb7UnuO7ZfpjPNqEeWFuM6zY8KTHBef8N1aIwMKSJ9r5bmNMwGRqwOIif8Ru3zq3haf93WwvF8sb9utBO0zIfF2MWoSOcBU2xX1P9KOeZLpRup3uRksNHs5huJtsh9Frvbv2wPIyXLaTGrCeii675lOXl94kQRJX6yD/FqDz9rmicpbUw9zAfsM6+jVkvaCkB1hHRM7TcrBwpXVYPEMfT37L9/bM96rr96piDnwLzFlM//VB4H31FvJXHBJ4+HpO+1ArR9AzWVUlxZ9WFEmK93hK/3rRiLW96AZd+g5hxaFsMsT68dqkzbclAPxAnbEY+mGqFIbqxtSzPJ/JLYdxiTU/3COa59I6zrrAMrou4ltgKzs1A+WZZ+Xr3LnwhBnYXYaZg3rE5gWXarDBxlNMhmPglbTSzcduVNQbfpk9jifHvUH4J8jK60UbIv/lOTSOmHhTRJqVXAYEWH6recoP2HsvUnRIzMaqBEbjHqRk/viLmkYaLsQ= X-MS-TrafficTypeDiagnostic: DB8EUR06HT123: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +KnF0SAaV1l7ECnU3Ez50LnEgGA9UPW++nHilUHHIjl9EJhtgeA+VxXH2MAoLG063Nmu2LS3o0mLDWqfJKUB+rZRAgBEf8/ieEHRjUJmBttTyg1lzuzOaZV2pthuIQUgJagSJFuNp9CTGapxiIkXdIeAX7r3V/wIulVM69mmo2UuS607GUZrMmAaXE+BMJSl9koWFDBUAi7zXXO09OTOXimBU6N790NhGEKVLfp0zYHYLOVUFtPjIcautwU5jwJ4CV5iZqRfGBkGZ58C9o1E1zFNHu90LLBOcyQ23R79kPGWCEx/crXN/QRwCnlGFgh1kMQtO67nwkuJLwPKdQgMUJ0riZa2X3hKpBACkI6lEwPROlXiYl1D/ZQv5DHQxKZKWgNwhrLO5FgmdwVKPD3Mmg== X-MS-Exchange-AntiSpam-MessageData: +StxlY/h/A0AFrImpO1XeEVg2sdFKqe+igsDg7xkgdee2Apvx1/Swog/HNs1N/4TS0p/2cTHzq5FH7Xy6Az/I9JdjE44WNqtphdwdCEChTSeNGIUBMOkJo7kXZWM3Y38ZaJ8ncF5OWtcIB6cS7RijA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 129f2283-8fdb-4c87-cbb6-08d8fac680e3 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2021 19:42:54.7645 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT049.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8EUR06HT123 Subject: [FFmpeg-devel] [PATCH 6/7] avcodec/vc1: Remove unused hrd fields X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Unused since be3492ec7eb2dbb0748c123af911a06c125c90db. Signed-off-by: Andreas Rheinhardt --- libavcodec/vc1.c | 2 -- libavcodec/vc1.h | 2 -- libavcodec/vc1dec.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 5d854b35d2..b7140c089c 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -1699,8 +1699,6 @@ av_cold void ff_vc1_init_common(VC1Context *v) { static AVOnce init_static_once = AV_ONCE_INIT; - v->hrd_rate = v->hrd_buffer = NULL; - /* defaults */ v->pq = -1; v->mvrange = 0; /* 7.1.1.18, p80 */ diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index 3e5368b891..9b25f0872f 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -322,8 +322,6 @@ typedef struct VC1Context{ uint8_t* over_flags_plane; ///< Overflags bitplane int overflg_is_raw; uint8_t condover; - uint16_t *hrd_rate, *hrd_buffer; - uint8_t *hrd_fullness; uint8_t range_mapy_flag; uint8_t range_mapuv_flag; uint8_t range_mapy; diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index a08f7fe847..8f112bf9b2 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -593,8 +593,6 @@ av_cold int ff_vc1_decode_end(AVCodecContext *avctx) for (i = 0; i < 4; i++) av_freep(&v->sr_rows[i >> 1][i & 1]); - av_freep(&v->hrd_rate); - av_freep(&v->hrd_buffer); ff_mpv_common_end(&v->s); av_freep(&v->mv_type_mb_plane); av_freep(&v->direct_mb_plane);