From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 59D95438F7 for ; Wed, 3 Aug 2022 05:11:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 322E868B73E; Wed, 3 Aug 2022 08:11:20 +0300 (EEST) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066019.outbound.protection.outlook.com [40.92.66.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07FEC68B6EB for ; Wed, 3 Aug 2022 08:11:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M5KyJH2MBXy/pd2QJxIa+E0onxTxb4N2Vk+J8kqwNkgSqmI3/PlYaAT817hwTK5+pWjwx0YzyV01aseJAwOFqUjVBl5L3Q7cBr1qOoH8A/PW0/qIC2LDjnd7AQRcAj/hZ6RnmrGTnnR8X6qlCEfDXHoOAGQuWOwV2KXBUTiX7b+WtP5fHN8Bp47jOVNgK8VsiXYB2P4dI1t73ATAbyC/Ip0OlnIndmTveM8ma/VkWEfatGmQETe+SSgp/qoBtSkyW1aBIagrsQemTtsRitvXARtT5r6fcJNUES2PC1M7RbDVLpf1KjogrhfbPyMAIoVTmyrT/n93wQdevqLulmGfPQ== 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=lRePRZhQvFQBLdurIWA7G2M3Ewp0XLTc+Jq5yDQ56qE=; b=ieW8dqfqZbIlyhEotyVLyllXBUd+DxU/H5zQ5dpRMfQtgfePNc+rQyn3NtwDDqR9bg2x5ot/KgGLSCyY5Vve/icL5EcHRZVxW3YrrWT2eMugIVT39vlsw9Mk7hKixcdqH2T9EpfLyP53kXRyKekQzw3FHuOBNmK2aiK8Lk8k5qHlMdmSClf215sFZ57Th1jGt0tCPIO1Qi91UCOn4m/FYyPk4X/nH4IZZVtUI+Uo+z1yNQC3CyMW6Wl0TAMJwKEdmOjO0JkgDyaUOOQtLIHHbcXCLFUP34QjbdVPcuVjKJQy+vexz7qx+mNkXS35B3IObT3p9+ByeYl1VNjGjzTccQ== 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=lRePRZhQvFQBLdurIWA7G2M3Ewp0XLTc+Jq5yDQ56qE=; b=ZNukjftZ+dw4wYvSIW78o5fkh2i7Dgj+KFhpHK9olyQqpcB0zkPjtWOOkKmiqrsQJm29khPEaRquDbVgwxNJT19S0F/BAh2rtYabGpRw37ILt0GO2K64+6BQgkI8QBM2CbzjGnC6drFSbvv8cF+XvGx6+dkDNGh6hxYdczSgYz21gbfXY2LT8YSEDkIFYX1BYFUKHRRUDDnT5Ui+phMPkJV/RooH7kvO7LhTp8b/K7KRimDduzPJlV+UIcClul/ZLxElTTkcLu+8kgtE90+jJlJi9mmhy/ku1l276QchYdR8uskuFvUjI3eQLh3eb7yfNwAPPh5jIo2RJqnJsCq0iQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by HE1PR0102MB2745.eurprd01.prod.exchangelabs.com (2603:10a6:7:19::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.12; Wed, 3 Aug 2022 05:11:11 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5482.016; Wed, 3 Aug 2022 05:11:11 +0000 Message-ID: Date: Wed, 3 Aug 2022 07:11:09 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [82EbCy7meiYc0/COo8LOmT/9iJWbE+Fs] X-ClientProxiedBy: ZRAP278CA0003.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::13) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <24080994-49d0-0061-485f-bb18e4356b15@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e77b294e-3298-4080-61bf-08da750e94a7 X-MS-TrafficTypeDiagnostic: HE1PR0102MB2745:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SczA551nmWJf46Sm9TtC6dsegS49pdBSOo7ZNpjYnvoFkjowRqKbBDLtx1zofH05uqWsrPwHnptrkchUJPGwkOhs75SFqmtPkODN53QRQ4+7lPcD/m7oQIfM7m0Pna5F+cPHqB7AWhOaBZ7lvImOegVHE16wjyFu/Mao0WflizFUf1AzG6YOd7d65PjHKMWZk/tK01ItfWXVoDJjvjyeYKszUURR4j/1QWi6z9o9lGDtlwE9FiIcdLmg3JbumRTQs9sIR8rSy7DEli15VRv/gZoe58Ig8a2E+JDz4o5VljpFuo4LB9euUamTBFr+MX8/6wPsc/jT2PuNbe9yOf9nSSQBEWC6l+jYs9LOilvVmwi8BRX9yzkANE01rgTbrJONV20ikzAAK5t7+pch9I32XyVhpAr3xoUvjzrkwYj39mV8ML/R2AEi+S/fopOLoDdKRNi7WAI3QKVIwtpnpXlmRj7KcM0Hw4KKiH8hJ9NDlBZWl4bmNlQQ41y8IZHAb5nXz8G3f6wUGppn+oTzVBdl3zZL3Tbf2rGCP2+2JRkrIvhlZUWrvmEsxvbytYeCJzwLqWrKG1Kn/qHO3aZFnBLSlRqlrI7IcVLPGE/1vAjLEyEN11sNjBSOqfG0hLDVrz9aJ7XBi4lem16e+Hwzkncs78KCYe4l5hhcE05pd2p7O84OTx0345Qq1xybBIrYwwc6 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RlQxSGVYcFRqZnFhdXJqT0xzNER2dk12TW1uUGxXdmcxQ3ZVZTFBeGthbUth?= =?utf-8?B?SlZlcE00NkpuTjF5ekpzWWNIVmVsMFdlWXg4QU1SWGVmV2Z6dlNCMTdYYzJl?= =?utf-8?B?MER0SlBQVlFENWlzMDA0VXlCWFV4QmhtRVZYTUpwQ1c3a2dxK0JQYjNPa21o?= =?utf-8?B?M0NpamhESlpDWTZzek5Ra0xqWWZhYys3cHFaN0tYeDQrbTdrYzQwWG9Yb012?= =?utf-8?B?MmhSbDZqQXRhUGxyMm9yYTNhaXlqdHJXK2tsWmF2SEtIa2xPZUJMREZ3Qmwv?= =?utf-8?B?VE9yRWRoSzQ0d1pFSnRscWZrT2QvTzV1a1FHb3ovQ2lVL2VLUm1LUUwxcXIx?= =?utf-8?B?OGxNQTVHOFhxZ2tIUkgzQlpQT0ZFeUdNeEQ1WUswNkhCMG5rejZFcEl1WnZ0?= =?utf-8?B?M3hTSE90VHZVMWJLZUZZQXFLSmFKcWNYdHo3Zk9rRVJRNEEvSGdZajB6WTV5?= =?utf-8?B?dEhMaFhHSGlSVHVmdXkxTjh6WUVLM2FyQ3VKMmVvelQ4RlNBNDF4Vi95NW5C?= =?utf-8?B?MGxMMkxuTWdnWGVuZ1ZqcHBORGlkbVhCK1NwK2dHTnR4TFhTeW8vTkdrWW9C?= =?utf-8?B?RkJDV0RQSWpSS3V1bk1xWmYyWHU5WjJEbWNWU24xQnpBclpMSy8rdGJ3WGxH?= =?utf-8?B?bnViMUxOSldzU2EvbTVyRE5MZGFzbDRTZXp1QXoyQUdKTnVSbUorMlBreHc2?= =?utf-8?B?QUp1bWdnWURCR3lmeSs0b0RFcldNRFU3YklOcEhSYW92ZFFMZUUwK1hKdXA2?= =?utf-8?B?RHo1aFJLa3JmNlpvMU1UVnRkcEZ3Y1BNVTdDcUczcmpiMFV2SnZPWlBqTW5W?= =?utf-8?B?QUZzcGFycWluV1M5cExyb1JIRU5ReFpuMjBNNGY3VE1RV042dUU2OStFcS9F?= =?utf-8?B?WFVCbEZjK1d4c0RxR0t1MWEzam1teklsN25kc2dmeGlDaTRha21hUjRDdWtT?= =?utf-8?B?WHVlQW5ZV25JNEFyZzVuUTZEcjJPeENmVkFQamRialV4eFYvZVY3bjNkMHFU?= =?utf-8?B?S05MMVMrTVQzWm5ncUU3Y0hrOUswVC9WVDZ2eXhEVVVQUjVXelFHQXB6VGVH?= =?utf-8?B?T1Zob2Q3Ui9rZHk1S3lYKzVQMWlLczI3VlYyVmRYZGY5NmNqbTRrV29CZCs4?= =?utf-8?B?cXNlMGFBRjNOdk5NbTJ5dFhpL01yVzUrd0RzQ0oxb2ozMElvSlhSQXZsNjBU?= =?utf-8?B?R1hETUJzaEZXY3AzQWxyRDVWa1JycUJrWlRnZGVldWo0eUdTSmpxemExYkVa?= =?utf-8?B?UVhWWWpPQTdCZEx0Mlg5OEJ0ZlQ5aHZ0Q1ZreTdDUjlhclpsbWRtb2RIbGhx?= =?utf-8?B?OHhndSt2WmdGU2V2UTBldklZYkNoOWNENTJybnkzeTYvU3MxaWFTY2JuUkN0?= =?utf-8?B?Rm9iM0o5UmJPTW92M2hpOG5YdHlOaUhLaGQ3aVhyaU4xWmNUU21QeEpnS05Y?= =?utf-8?B?Q0dWejh3bGR2aUNEQXpFMGVmU1FTWUhERjBRTXFNeDVBek56R29aTUhFMUdk?= =?utf-8?B?bXVZVUZsZlN1U1FYNGVlNlF6QmJ6QnkzSjVhUnY1d1BWRjlHcEpoU2R4elho?= =?utf-8?B?MEZzZEZudmlSbVRBcnY2SDdXWEpMeHUzR3FyaCtvTkExMlZtbFpGSG9KWkFn?= =?utf-8?B?UVVldE9EYkE1b3dXMkdEYnB4S0QyNEU0UkVTKzl5YnZMWXEzdHZvZWdKNGxH?= =?utf-8?B?TTFoMStMU1NMdVdHVUdCQUtvSk1RUWVvUTRtOXVidkpOdEdQWndxZWtPakpS?= =?utf-8?Q?qP6+fU7WbAxjv62zGo=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e77b294e-3298-4080-61bf-08da750e94a7 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2022 05:11:11.4241 (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: HE1PR0102MB2745 Subject: Re: [FFmpeg-devel] [PATCH 1/4] avcodec/intrax8: Remove unused IDCTDSPContext 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt > --- > configure | 2 +- > libavcodec/intrax8.c | 4 +--- > libavcodec/intrax8.h | 3 +-- > libavcodec/vc1dec.c | 2 +- > libavcodec/wmv2dec.c | 2 +- > 5 files changed, 5 insertions(+), 8 deletions(-) > > diff --git a/configure b/configure > index 8c7e8c9d1d..974768a663 100755 > --- a/configure > +++ b/configure > @@ -2733,7 +2733,7 @@ h264dsp_select="startcode" > hevcparse_select="atsc_a53 golomb" > frame_thread_encoder_deps="encoders threads" > inflate_wrapper_deps="zlib" > -intrax8_select="blockdsp idctdsp" > +intrax8_select="blockdsp" > iso_media_select="mpeg4audio" > mdct_select="fft" > mdct15_select="fft" > diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c > index 73b8aeea78..b99e8590b1 100644 > --- a/libavcodec/intrax8.c > +++ b/libavcodec/intrax8.c > @@ -25,7 +25,6 @@ > #include "libavutil/thread.h" > #include "avcodec.h" > #include "get_bits.h" > -#include "idctdsp.h" > #include "msmpeg4data.h" > #include "intrax8huf.h" > #include "intrax8.h" > @@ -692,7 +691,7 @@ static void x8_init_block_index(IntraX8Context *w, AVFrame *frame) > } > > av_cold int ff_intrax8_common_init(AVCodecContext *avctx, > - IntraX8Context *w, IDCTDSPContext *idsp, > + IntraX8Context *w, > int16_t (*block)[64], > int block_last_index[12], > int mb_width, int mb_height) > @@ -700,7 +699,6 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx, > static AVOnce init_static_once = AV_ONCE_INIT; > > w->avctx = avctx; > - w->idsp = *idsp; > w->mb_width = mb_width; > w->mb_height = mb_height; > w->block = block; > diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h > index 5b8946ea25..3ebbf73434 100644 > --- a/libavcodec/intrax8.h > +++ b/libavcodec/intrax8.h > @@ -44,7 +44,6 @@ typedef struct IntraX8Context { > > // set by the caller codec > IntraX8DSPContext dsp; > - IDCTDSPContext idsp; > BlockDSPContext bdsp; > int quant; > int dquant; > @@ -86,7 +85,7 @@ typedef struct IntraX8Context { > * @return 0 on success, a negative AVERROR value on error > */ > int ff_intrax8_common_init(AVCodecContext *avctx, > - IntraX8Context *w, IDCTDSPContext *idsp, > + IntraX8Context *w, > int16_t (*block)[64], > int block_last_index[12], > int mb_width, int mb_height); > diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c > index 5c5b31ad32..b53490b3ab 100644 > --- a/libavcodec/vc1dec.c > +++ b/libavcodec/vc1dec.c > @@ -391,7 +391,7 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v) > goto error; > } > > - ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp, > + ret = ff_intrax8_common_init(s->avctx, &v->x8, > s->block, s->block_last_index, > s->mb_width, s->mb_height); > if (ret < 0) > diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c > index e61b549439..6d9b72d123 100644 > --- a/libavcodec/wmv2dec.c > +++ b/libavcodec/wmv2dec.c > @@ -578,7 +578,7 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx) > ff_init_scantable(s->idsp.idct_permutation, &w->abt_scantable[1], > ff_wmv2_scantableB); > > - return ff_intrax8_common_init(avctx, &w->x8, &w->s.idsp, > + return ff_intrax8_common_init(avctx, &w->x8, > w->s.block, w->s.block_last_index, > w->s.mb_width, w->s.mb_height); > } Will apply this patchset tonight unless there are objections. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".