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 7A5624073F for ; Sun, 30 Jan 2022 06:29:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 136E268B10B; Sun, 30 Jan 2022 08:28:26 +0200 (EET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074062.outbound.protection.outlook.com [40.92.74.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4209C68B10B for ; Sun, 30 Jan 2022 08:28:22 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fcAzwdR24z7ca8sBQEBH813+nMrnwt7C/vVrwyljDVCrUAD7PW8Ub9PcCx9pp4o05nJYC/hmz8CXsISR9kIBvRTq7AJBBoCLTC4FwsF/fe1JzJr4omxN6jZIHqT1z440PcEoXwINWShbRk+RjJ1Tl7JTt/LzFoKqQGCmtXqu/dx/jFK8Wlf5xTQ1JMR+cEBEQt87EdGKfNsaFN/VQ9cyIVpAlYsMTmqXZzmvKH0iS8fnv/gkUKE6lxF1rnvw3csq88cp/MBT4xw220Q0GR2REL+62fx1XQD6CCgpgCCjRKRwfeoR6f+ob3q89SZC/+N8QNvfhq1yYNe9jasL7PSCjA== 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=HABDUQ8uO4qiV3YQ+txT2vA8zW66V3hs226HYDQ0puE=; b=CYvnqg/6K9fFKjqeHJcZRuSosMZO269DU12M0pQRHQwVCWmDvVoWPT49xeV0KaC9uFMIWj/d6zL8JzGFupB3CDrKB9t4GdWAXNZDxBm/CeO95uqjZlTr+Jmiwru2hsWMC10MOPn8F2mQqTAeJpw3hMMIMq0+59AOAUz74i7DWm02pPAm8tR9d+QNcEk3CTxtvCTqqeffqEgMkSrRQYxhi3ZfBrCroYHNstx9ZwzSgmxUrPdSr1mLs/9jW0JQEoRnxp+OmCIpyM5puTJ9eDwVDUO9DReeW4tXQD5WRM5+UgPEnqsfdjBipvNYUGYWkdjbVvxP4OLmGwJnA6S/KSMC6Q== 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=HABDUQ8uO4qiV3YQ+txT2vA8zW66V3hs226HYDQ0puE=; b=BQVj73qOBatf+i+KMkaDSnrEtZ12bCasK3UMKC6ffqqqd21n0J+yS8bwSiXQ9ywZL7jPK7ZecStW6ekbV1/R4ZiPXmDYNaxYU370vWsE2yn3TmEHNSKjCRFvpoPTx/h3wW8SRYPQi3gl0Nfc03Az8UCtxgCa5nh6pzJS/4aw2y0b+2hKeCCKd3oaJbouBv3iGRVuLW6umqXfQh7UWpSkb0ukgejIMV6SUa0upyUvydRy5bsZpei8CA7678P/zj8/j2BRwsEVhOmLCs/6/QKUwfjmCbycruQcJmAUEYoBkEppNIFDe6IgqGRyrw3C/sYE5X/JULeemL43rNoOaKIX3A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4247.eurprd03.prod.outlook.com (2603:10a6:20b:7::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.20; Sun, 30 Jan 2022 06:28:19 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4930.021; Sun, 30 Jan 2022 06:28:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jan 2022 07:27:16 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [r8moX9uyhEW3mm2qP+3W/MoxNr6hRvEN] X-ClientProxiedBy: AM6PR10CA0044.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::21) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220130062749.936489-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2597359c-ff89-4e1d-7d9d-08d9e3b9b4de X-MS-TrafficTypeDiagnostic: AM6PR03MB4247:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PUQd6H2iQHDaeZeFdd0Imh+fqgZBmEHeGrhmzbHUR2yTSZGew6cV8uqYAjUWGLTFdgalhdXxIq+YGYUXu9UUfHg1YGu8kkM9UQbOFiMzJ0328ugPGe9aBTXYbhFXtt9K1wN0Bi49blWLmuu7AwbyO4IXbDPYdY5UHZd4yNE0JRuSrj5I+6hhBG3ltorg3/6G04BhrJB4ssCBPI/oHMWpPo3XbLdBkCwM4jqe7hUGR4KoKas/jEcwLztDJ7TXUZF0sWQGxS1g7ZWrYv6YUyQMGDgGGaGzR5aUsxiRjqxF4X2/LDowGiSNcVNFXlvWpXG1c7byLbFkeqgst3Q3uCtmymHfB7IBrgz2Wv1WQfE5CqjeKZN4Cg5YAQa+UXfAbVt/yzOhywMnJynP3nZE/aHuCNhkI4N9AQZwhzIh35YSs6gDgVZVQsGllq0Q+5Wt0RfTT2AwPeQ4XTpZd8m3j44wK5HpZMAAqhdXVfwlUe4wv7s/Px7gWhpetgJhog60aOdifvifRe9LrMjs5pO3LZ0ozbLkjD8AdUg1qksAKvBW3xLWZbAFIx9AWYj+R4iU7CSe X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?KM97F/8oXS+YzRoK9w6m5HlL1XOpFNkvZtjYjHNPH+xESal0w6WI5fENpBVO?= =?us-ascii?Q?aC36zkR2nEiBw/kAvI81bvA9kOkLOjrwpZ9LVZwiasU5xoSNr1cyxDgVsgsv?= =?us-ascii?Q?xod1SX/aD2CEPXylqJjxFklC2eY5B9BKNR85gif5jbCd2hg4UWyWhUcbRdfF?= =?us-ascii?Q?u8ySVdBh0lq883jK7KBSeLJOdIWMf9Oj2rwLSwyHiJtRtBraBsIOuPm902xf?= =?us-ascii?Q?gALYxs/UY4u8QOT/eUlXFyZoaTI/KjyjUj60HyzPAi8k6QlK5IjqvVLvSaor?= =?us-ascii?Q?axuPraJsh+LXER2JpSl1Hb54WJfbaOrjgGOh+RGYCJFo0V1JJWrAo7QzOnb6?= =?us-ascii?Q?AkBdq4o5gFOD9VYRBZi599RdInfYsp7lQl3uYQ/3bmYvxBiiswCc/pARtTFt?= =?us-ascii?Q?cX1IXZv8EGiAXyOTH5nHmsy5Zzzk0V+vEz9s8M8F/zMdK9LOZZs8kzLyYwmO?= =?us-ascii?Q?xKlx38Cm49ygFsFoG/3EaKpdUQmxY2PJOGsFHHJRqSJc+cE1YgZuMzo8woUU?= =?us-ascii?Q?gxEsTuBqKMuVzCQBcC/KS765mgqVZAzZXXolDD7cr5K/vDsLkaJ+7oE2ttKc?= =?us-ascii?Q?f7zJupBsgmFHJh8WEP/j/DdR4jLba6DzrpWEpaER9Ad7uDeK2xXgO4UCjpzq?= =?us-ascii?Q?3+K9k8zXLAeYDZsBUcGsgzOA2hw+ER7re9IopV7XLyzqhIAOxKtkAXkDIdOy?= =?us-ascii?Q?O0mVT0fuGmQ9O0UiY3Fes2UBccUsJvIhOcliiTtQ4ew+51x+T/2KskXY4uyo?= =?us-ascii?Q?8JYj75/InOxkfw3E39UVbt7xA5lSG6nlwsyluzGr/aqaK/+xIXZaYA3qDsQo?= =?us-ascii?Q?jg0eK/XIOWEsLevCP7bUjvcMgtoyD2x/O4fD6SQsM5prwd763RKrV+lKmsxX?= =?us-ascii?Q?YZIKH3DVXJjdszhsPCXsAFYYBXCiK7nNJ4j1ir1ihc9KYoymvEesx9FOt5Bk?= =?us-ascii?Q?tlJmUiiMWzo7BStMln1JHg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2597359c-ff89-4e1d-7d9d-08d9e3b9b4de X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2022 06:28:19.3664 (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: AM6PR03MB4247 Subject: [FFmpeg-devel] [PATCH 08/41] avcodec/wmv2: Move initializing abt_scantables to the decoder 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 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: They are not used by the encoder at all. Signed-off-by: Andreas Rheinhardt --- libavcodec/wmv2.c | 6 ------ libavcodec/wmv2dec.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index fd64a0938f..57e1267782 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -20,11 +20,9 @@ #include "avcodec.h" #include "idctdsp.h" -#include "mpegutils.h" #include "mpegvideo.h" #include "msmpeg4data.h" #include "wmv2.h" -#include "wmv2data.h" av_cold void ff_wmv2_common_init(Wmv2Context *w) @@ -36,10 +34,6 @@ av_cold void ff_wmv2_common_init(Wmv2Context *w) s->idsp.perm_type = w->wdsp.idct_perm; ff_init_scantable_permutation(s->idsp.idct_permutation, w->wdsp.idct_perm); - ff_init_scantable(s->idsp.idct_permutation, &w->abt_scantable[0], - ff_wmv2_scantableA); - ff_init_scantable(s->idsp.idct_permutation, &w->abt_scantable[1], - ff_wmv2_scantableB); ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable, ff_wmv1_scantable[1]); ff_init_scantable(s->idsp.idct_permutation, &s->intra_h_scantable, diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index 7518088b6a..dd0e2683f5 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -29,6 +29,7 @@ #include "msmpeg4data.h" #include "simple_idct.h" #include "wmv2.h" +#include "wmv2data.h" static void wmv2_add_block(Wmv2Context *w, int16_t *block1, @@ -537,12 +538,17 @@ int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]) static av_cold int wmv2_decode_init(AVCodecContext *avctx) { Wmv2Context *const w = avctx->priv_data; + MpegEncContext *const s = &w->s; int ret; if ((ret = ff_msmpeg4_decode_init(avctx)) < 0) return ret; ff_wmv2_common_init(w); + ff_init_scantable(s->idsp.idct_permutation, &w->abt_scantable[0], + ff_wmv2_scantableA); + 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, w->s.block, w->s.block_last_index, -- 2.32.0 _______________________________________________ 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".