From patchwork Thu Apr 8 19:36:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26812 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 0EDD144ADB5 for ; Thu, 8 Apr 2021 22:36:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DB44168A636; Thu, 8 Apr 2021 22:36:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-AM7-obe.outbound.protection.outlook.com (mail-am7eur06olkn2087.outbound.protection.outlook.com [40.92.16.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC4296806EB for ; Thu, 8 Apr 2021 22:36:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=drlGZlo8IdeW3RXq7y6mnK5cXTdzVHkOq+lOhju3tu8o+vqKf3WC8TQJqWddIMttYkQoQ7/aDHYozNxHEgQlV3ROqIlCmgynfaFovTpuBH8SCjTglM0J8svbdXWDThGzyL1xUDGLUXe8uPBCYqLRdR71bVeA+1Ej+Yx2IZF6rLdKuXbNrcF/YEXXDvgyAzk91Iinb6OgZK3C/dCq7pvvRTv9Rag+R9Qx/sKIH9tlDD0fPqjJpy3phpFF3dhhhfUppTZp54GzvgmQwzsAoAQUvk2pdTJaFN5GIOAmH+EnaIN9h1BzjZ4ANSM+P7V8/hneL60UFkhoWyoAQ2KXTsJWSQ== 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=H/AqQZHzgIwWKlqeX+NoLCn4BVEbavkqyBnuSDGpRSU=; b=bl8PK1+Nb74/IaHkRPiTf4J2dXmTJWZdWnLUy6PBpvow2IjxrbfQOHViw7OGMe6c9a6tS4wJeLhojHLYHtmU2AgP8RThXT5u7vxATRtO5qIYYaubgq1PhEEPhdFotd4RH7A65CyMkv7lBlcFEaYs4+M9qziP5auqiO0M00k5nKGsKM14sSMn2x/9sqwg971sfFBsBQgeu7SQbhMPwz37e1BjaoEssLvQTu/kdbF5NrTAn+W4NsPE+RyeHJSwrB2Ptjmqgi4eBO5KY//Yc9O3cmhqP8McsmrD29yr6zzs1LmdzchPPJdgGwCoXt8tIEt98PzRF9eRMPc1ZSI+KChzAA== 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=H/AqQZHzgIwWKlqeX+NoLCn4BVEbavkqyBnuSDGpRSU=; b=lhebfDopgygWS+K4jgkfBJsKDpkurHzxES2eGDdig0KryzYziNVABufqPlmqeE7GWjstOIdUzZo+alKwj7NLjl90rM0OGD83N2p6tAyb5JyEIpQjsFrWAvYggSww2PHyigTJQG2AvRo4aMWESGfmgOe+I2sxvGZvG3LHGzIACCvob28Xn8WkKv7NJsZMQbrj6GXW/M5SoGc3mIoGpEC4ZVH7VCf6eJX8SSLF/1WShkh+QGBMsvE+dFVyY5VnCSupAcp2APxqDwtIjLpHwHrbXelZJbEdfTRBAXSLngCOWwQc/a7JwDrsqCwDRfVm/BWAXXywRJYrcFh2U0MX55+wew== Received: from DB8EUR06FT049.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::41) by DB8EUR06HT090.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::489) 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:36:23 +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:36:23 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:39358FB288FC0BB4B59632976EAE3A7A62DF459B645E2A9676395F874C344057; UpperCasedChecksum:B77066D2B50FC211931424E823F1244C058D11C8CA780D42376EA63DDF1F7BDE; SizeAsReceived:7384; Count:46 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:36:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Apr 2021 21:36:08 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [obRnG6PYCvac06eKrk77mbY1cbLRl77Y] X-ClientProxiedBy: FR3P281CA0015.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::13) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210408193614.1239243-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by FR3P281CA0015.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.8 via Frontend Transport; Thu, 8 Apr 2021 19:36:22 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: ed49d175-a3c7-416d-7e12-08d8fac5973b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQDZtlYU9il0kuGVxzoXM2vRsFtEO02wE6j65gxk+XtfAlT6/sdtazoBMpQzXh2pxX8dbPxAVHf3Z9xy3hZCaUN2u7sU641Bo2/rAsDm8dTdHR2qLE2rEwp6KiLukghrWre2c7P+mMIbjKSLyGbUmGqfoNDeaXfbiq4QwfuQZQecXktYICqD1cH7d5vRiTTML4VL4bFn2dnoODrpF0jGgCNmH1Pbw2imMB4ZoRoeT4/SpmOQYBf1Y59CeLXR/FVktWdnXozu5drAtH7wBsO/llibZ5nI10eT3BDIT27CgJEyYeE4QCVG1JoUgUr97Lne8kUR5gjSRxbruIvTRTPX9NBXMCrSjIOtTHPNEl/tSqnzodOrBXrtON7Dn6UIlYfHhwlSP3efzvtNWGhdltWQ7JM6frqkOjy/HYlRJOnGrwIt0d0NkZ0rXRfyY9UomQVjgPOJKQc+wM1LcGmFxFURaHzmM2W3Ouj7szlu9TgrIDuymHm0DxN1Du0udLVwAZwo2ghY1wCJP1TGmhgoqLijMWgwm8brUiByo15/cCnBAjftCA7TlsmvP0M08udpluJHuL8QWkn9ecCX4M+LqYnWr8TFivivb+AXGkr8lR9Rg54/cDZg/+S+UzAnnXj8Mb5aFBTAN+hLVGOKcyUtyuJqmM1dNFVXLYe4o5hSfc2p701bD1BnzPz19xKLhSVALa/OUNaMiDyD7syPnEqyGwweBQFpXurFdHuvmyojGbo/txV4z6snlPC324yHmAz3+VfI74= X-MS-TrafficTypeDiagnostic: DB8EUR06HT090: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L8hPPeI5LPvANnN5oyiX9++r9JDZgpt6rV7e5HmujaAIgKqMCLfI0Bivr2P5L3M6iB7BG0ZQcCR+UheL4xK1zo9A3pbGEACvWvxeUrAOaNbrTp9PKYPvbdNNc6Hfr8liVrDDfnFqU8Z3ZG+UUljHNEud0DDIdR8KyS1k1gCug8QY5ogdknLx6MFc2HQS/wL36lFpfBxHyNJ+bfJl8Vug7InsJqxf3nUBhqTtfgtGRQVhDuYVaJWyvaMbE3umyyeWSH+azA/tFDo9FlC/qMBrMzyrkDlTdEbSi/Xlp4BGVh5Z6drFQwBVcXAVUmNRmfOEQVgx1FEir1YecGxUrkmmGJgwbEvZmlvsj3NwIyfyDwMHJiNzNy5jwP+Y2VFIaKz1PV+npgY58VGWtEBJ57xpsA== X-MS-Exchange-AntiSpam-MessageData: e97RqmcudiRBvy7Je6187oS+vcD1e69gUX79EhnJmnkZcoFH7EJ6Qqlsih3zi28Ccv50GdUmAwJqm2JrVDall9f1Wcai5XQ8IYYTDtvgLLrt+8+j2LC2Kkj79NHX7BxcxAszds3cITnEwaFaojK4lA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed49d175-a3c7-416d-7e12-08d8fac5973b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2021 19:36:22.8443 (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: DB8EUR06HT090 Subject: [FFmpeg-devel] [PATCH 1/7] avcodec/rv34: Move dsp init code to rv30/rv40 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" It avoids both runtime and compile-time checks. Signed-off-by: Andreas Rheinhardt --- libavcodec/rv30.c | 1 + libavcodec/rv34.c | 9 --------- libavcodec/rv40.c | 1 + 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index 36cd5345fd..e2b75fbec0 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -285,6 +285,7 @@ static av_cold int rv30_decode_init(AVCodecContext *avctx) r->loop_filter = rv30_loop_filter; r->luma_dc_quant_i = rv30_luma_dc_quant; r->luma_dc_quant_p = rv30_luma_dc_quant; + ff_rv30dsp_init(&r->rdsp); return 0; } diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 99e580a09a..e68072de06 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1503,15 +1503,6 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx) ff_h264_pred_init(&r->h, AV_CODEC_ID_RV40, 8, 1); -#if CONFIG_RV30_DECODER - if (avctx->codec_id == AV_CODEC_ID_RV30) - ff_rv30dsp_init(&r->rdsp); -#endif -#if CONFIG_RV40_DECODER - if (avctx->codec_id == AV_CODEC_ID_RV40) - ff_rv40dsp_init(&r->rdsp); -#endif - if ((ret = rv34_decoder_alloc(r)) < 0) { ff_mpv_common_end(&r->s); return ret; diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index e0903226b9..8532a872d9 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -567,6 +567,7 @@ static av_cold int rv40_decode_init(AVCodecContext *avctx) r->loop_filter = rv40_loop_filter; r->luma_dc_quant_i = rv40_luma_dc_quant[0]; r->luma_dc_quant_p = rv40_luma_dc_quant[1]; + ff_rv40dsp_init(&r->rdsp); return 0; } From patchwork Thu Apr 8 19:40:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26813 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 9565744B681 for ; Thu, 8 Apr 2021 22:40:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 78BE968A607; Thu, 8 Apr 2021 22:40:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-AM7-obe.outbound.protection.outlook.com (mail-am7eur06olkn2094.outbound.protection.outlook.com [40.92.16.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 283B66805BE for ; Thu, 8 Apr 2021 22:40:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zym/VJxaOHsMTZ+0HxXpnuahN7sLybkhz5mXZueg9R7u6Oha3EPz6EuhyJYlyo7hpZh4RVc8Sk88G9Y2qUEys7ffWZRIx1W7hCWhJgvO3DlEAtMKMr1ekQrilR8EYU8igcas/7l4MOzHcLFb/7d9dO+2Iv6JOZUrvkPKJEBdVwKbwCOZ0B46Ie4RqDF6yzTDEdB8yF7GDpQnWuQSV5h0WRKyPpQZ15oSlkzfRDgt4k33c1NEJZo8PrEYXajOgLvd7T1rayTVbygG55ZaAKEZt81GB38/LjncFy2/rZ/b9DZa+PQmho1lB00t9VKBCX3n6co9B628f5t/vAbKmq0OcQ== 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=dQSaAbgBa0bzL23E9GvV0WmjE2IF8WfATl1SkcN7QjI=; b=oNFFunkraP9LMkNzoHLh0kgoR0uqbK+5jv9RK+v6kp5JU6EIBid2cj0tTLTLzKqFSgAxBP4Qo37G3sDWtyASHZnWg2lMhczBGXZxE+/iuRgDswimLYFOEVdWeEoO2nAJoLez61wK/aNsm7uNVY+zeszyPqKBG3au8M6D9J5pZ7DeciHxd68c6b9H5pTEOafXFnsot4CydM9/ePtBOcNPKouI2Jv6KvuRfAhGTqDRBSGBIh5Yjp5X7VCryEsb+/ouDvaxzpOWcLdZPiU3q+knr4WnAlfk43UK5oHi3Fee1jC7QCN2ADugonoeOHEdSYErpEkVq9CsY+XMvRSqC3AsaA== 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=dQSaAbgBa0bzL23E9GvV0WmjE2IF8WfATl1SkcN7QjI=; b=E19WUBdw+uBE70W3snRJ2f3vUg4hMjSE2PszeM5n/KAjOYRFyDPjs3F+IHSGxaCrO51XqnCpCeTgc1ps+mQkx97+DnUdTE5dRQT1OOdpvhOOpvMRYGcfdrOVwR55kmoizYuIjzym/Ggt0uB9X1RjtF7hHXxW7KhubfQjcZ0uaVW+MQTQlsv+IvktyI8Jtr99laj2SbqrOXdNQWYWqqNEOGFpS2v52ceEBAn+YH6MGqHZlrE9arZAXSVoT/FUCFgfjMQipmdPWFZchi8ITsxZf36n91CxblXKV5TcBQZPo7OHfcwdj3bz6mG+8MGNqvuGHLGO7RKtXCEIrVcviCexOg== Received: from DB8EUR06FT049.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::53) by DB8EUR06HT239.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::104) 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:40:39 +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:40:39 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:550FF7D53241B899454D630FCD8595625D2956141E5888AD9B47A3FEB8AA067C; UpperCasedChecksum:53B6AA0B847EC08BF5E282A4EBA750B287BE00335E8AC45E74136F439E6E4F45; SizeAsReceived:7586; 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:40:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Apr 2021 21:40:26 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [Xzkp2FwnjoxQvFM6tF26pm7OR50v8sfz] X-ClientProxiedBy: FR3P281CA0036.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::18) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210408194031.1242606-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by FR3P281CA0036.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.6 via Frontend Transport; Thu, 8 Apr 2021 19:40:39 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 80cc5c03-71c3-481b-74e7-08d8fac6305f X-MS-Exchange-SLBlob-MailProps: pt8ZUcDWjMU+Jpog8L2KahIVqCwAwpIudbCPi1946BDHmNPxObiuPj6yh4nfoVVAft6oVXQ1FFJvlYb9kH2ME4pfdhWde8Jy0ks1vCRGCmHVnNwmOz72JffF2XnFjzZUsVW5y8lkroI/waMUWUm+540HRpylTv5m68pfdW1qhD0NsgarYNzv6Koo4sxQL4mnAgvjh3k6xSCjw+xbC0r2HOpxb95jFqr5lMfMZP+c88IskILsrRbHGJ72tJge8mPoNvle/ggASBnMholcque6BZA45Z4U8sFVrRW4BkZiOZJuAOO2MKu+5dEmz8ZAvKlRlCHfBNPFPZcPIOzrNeX7+9s+lZe96l75lftWm/1Z5Gg525IHw1jW82yMWqd1peqR8h5OJgmNkCsdxOTegbFzED37c/zYr2h+KdzUwbCQuQ4Yu8z72ANZBtuAFFL0sgFnDW5qbmIL2nKN3Ll9O7AbVzuV1eE8kYc9paLXVQ8EUnyQ3UDibk0m2mUqkqOOhau0+FKPVrFPML4BrNYv02aBSAHVU7cDVnHlAwKDfvV6XGfIdYIm007Tg/17yZsvbsY5elWmzA9qtrBbKbZRAbKf8TBQlGecK5jB71AyzPw5rmN/Z+p7lqI1sbLOLFBxyeYD2ueW3gzPJh40Gk7N6/lOm6/K05nUFntju6p05DIgTwDgi6Ulg/5vT9JHbJM2BEnRMH0Dgvn6y7oNuIHSsFER0coODWqYDUnoqx9MYmSKFEzSb22b5sGAD4BT9HHLckbZpFnUxDJUQo0gtJV1leMOIdchRPbT7dJjWGmTIDKUQbYUfMifFWCGYeij8hyJ+xEoUvKrTKB9jWcbCiHnR2dZtZXEegIFTTQ5LkHpyztMV1OVCI/2FpCiQA5ZHGmZ5vsmPeJgfjWJvtzXLqVje6yp9LJwuzlgLR0IrFJO+X/+YFpxAdtUXvBuQ0edhbKdRoVi X-MS-TrafficTypeDiagnostic: DB8EUR06HT239: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 01/vQtu0KbCedvAvecHf4ABLvVIGIPZAFHM/6xJCa4eCXPk0VCggEm7kFfa91uXgX55xDwelKRN81x8Z/YJmX71MAWOH3735rwAnqElY0qSO0m5Oj+rX+kRz6uThBXZS44V+1snxc9uGmuv6ph9o31ERXk3QqFljHRdXr2qVwUcNQS6cYukBXVAjqz9YBdL+m4bpqI5WFU3pga/NQNhDvN9LpB8QrEYFVL83P0mT3iF7u3JF3eNSwH/hCbWGDOgEeJbUjN4nKs4mQKQTJRHdfDMcrr5w5SepX2mNdvGBVPOyTrYd2o2Qo2kHbYTNwjkaUnJj9O4Z6+Zs6gxmNYp7dNvt4Wq8nWVlN6H6lQM/QyEAtodPAE7n3/q3ItG5t6oFZFhpcQZ4G1eeEFcL17ex6HUPNahGZuBs1xnIfMcW/SzZHvFYClX08PS4YqHDL5vL X-MS-Exchange-AntiSpam-MessageData: vLCugdngT/aL5tTj8odo32Gnizvm09GxjKY6g8B0HYFGcGwmStc47Q80ucKAFd8nn0hAltNMn3p3OO4g16p1B2ELjnPPv91EntJ/b6Z/neKG9YC3xoqkKisBvNJScfQf8PqL8nVIrvn1FV66ORz3PQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80cc5c03-71c3-481b-74e7-08d8fac6305f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2021 19:40:39.6915 (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: DB8EUR06HT239 Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/h263dec, mpeg12dec: Remove redundant writes 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" ff_mpv_decode_init() already sets MpegEncContext.codec_id. Signed-off-by: Andreas Rheinhardt --- Supersedes http://ffmpeg.org/pipermail/ffmpeg-devel/2021-April/278741.html libavcodec/h263dec.c | 1 - libavcodec/mpeg12dec.c | 1 - 2 files changed, 2 deletions(-) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index e8b4d83e6e..192cc487da 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -130,7 +130,6 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) avctx->codec->id); return AVERROR(ENOSYS); } - s->codec_id = avctx->codec->id; if (avctx->codec_tag == AV_RL32("L263") || avctx->codec_tag == AV_RL32("S263")) if (avctx->extradata_size == 56 && avctx->extradata[0] == 1) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 94221da2c1..2d2b7517ad 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1067,7 +1067,6 @@ static av_cold int mpeg_decode_init(AVCodecContext *avctx) s->mpeg_enc_ctx_allocated = 0; s->mpeg_enc_ctx.picture_number = 0; s->repeat_field = 0; - s->mpeg_enc_ctx.codec_id = avctx->codec->id; avctx->color_range = AVCOL_RANGE_MPEG; return 0; } From patchwork Thu Apr 8 19:42:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26820 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 4B22B44B595 for ; Thu, 8 Apr 2021 22:58:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2412B68A633; Thu, 8 Apr 2021 22:58:22 +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-db8eur06olkn2061.outbound.protection.outlook.com [40.92.51.61]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77853688078 for ; Thu, 8 Apr 2021 22:58:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rbc5BPaPH9CFHcjqzPffs/4LuArQH1R6v5nnw25WrImQkjtupNxWnMUy7vIKtKrbStBcnQLiCkMAStSJXmeJsEbE2dEfMVkI95tusyc7dpBsvUfjBjteiQMjNf5jGhkoGh/MEvEvvdoeqJOyvROCE2lrW5t6Mqra/d16S4oBzshgK9Ew2KeDTELymNskccZYe2TlRUftVnxYlR9S/Q06ALfG/5OY5pyEnuP/+2odsZe1JwGQ9kQSr+v+1jAYFbqw2THmRFK6SWsad/6lyecKi+lPardUKauSHgiOpl92nOj4ZnUSyu73m9GUhHRg9DDRAhMtU0YNeN+dCRkoD8JDDA== 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=Ei2elnCUzBIAdcf5au0C12C3FuJRKNC4OzEZ4HlGDt0=; b=hwtuoZ5kaW4f1z8vkFBGuWCjJWg+n88eN1g1MoERmHBZcTouq3AKTyv/cyvo2D3e04Sny2xZWfmTNb9Lu1u+YvG1dmUp/p1j/lNaaLoECL4syxOVJVLGuiZJi6cGY2WNDalbTErfRCbF/JraiQMByhVVMDMcQ7QGxvU9Ghk7vEx4mfnbI0ljJtwfT/2my9eab1Qxngi9o4MUstKIMavwAOHhEez0JJNdY289wkJmxVDOeOcOwAv/ID0KtRc9n39fJszXSsIOljt8ka3KNi42gXWVp6XwpFrqcL6Aj0lBWc0k4AhYYAlrw1BZ7ONncA5VI4+Y16y9IftLKcnQwdAbrw== 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=Ei2elnCUzBIAdcf5au0C12C3FuJRKNC4OzEZ4HlGDt0=; b=NS1/ehrhUTT205K+4IkBEkzMlaPETthEo7r+6zLwD4ikVi+DKPHsluc6c66OjvHm+a0eNQiYw66k9oxxf9xeSzYcGgfMgGCdekPsIEufuyz8dvsIxFN8Lq1yx1Wc75YnXu9Rvxs5QqQBNljyD7RO5HAlfWo3oVXn51y8Yl6oYduqyb9jGhksJ9QyOcZte3z5H28hu2GwYm1uqgHXYwqqWeZaEhoJFGzWZZ/S4s+kn9eqBEtvYXrrhDTgVmSpiv5fcyfedxESJWqXpKqAE+RaW+YhKeTM8VsnLRhFjY4XM+vSd6KaEId1Uts5ExI0qeDO+ziSALpigFVhbh7AgRdrPQ== Received: from DB8EUR06FT049.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::48) by DB8EUR06HT256.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::359) 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:49 +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:49 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:4837BF6089E798D2D47CEC51AB266FB6ACB6F1ED8DF140A10272CFB8457C310F; UpperCasedChecksum:2F3FEC938349E162780E9BEE0D892933FD7D4037CCCCD52800B63F95808A7D96; SizeAsReceived:7606; 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:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Apr 2021 21:42:16 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [20VI1oxsyknCVEMHIuJfg53FXu7eP9Rp] 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-1-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:31 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 4657c83c-ce96-4153-da6f-08d8fac6733f X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUUcF99Xf9jcMKqCiYf/T76TroX0Q1WGEN8KR3R/tvVPc6bxzGUM3WfQLFHzT9NeRdDKYm86ATYIMhagr2q7Dauc5BvH/rhrlEXTVHmqCkHHdTUwLgd1XXy7WlDjaC0SdLGcscuGiMFxuJFWBpx7pslpJ4X7Rf69wxWWK1qx+Anma9v5VFWPnpOH5rOY6kZA26W5gXalNu5BAYKZ0khrFKULeOtfIt+m3s6/b4lyeNwos5r5/jEJ3IMDMxATttWhsAtWW90t+OmJk1u327wgiapM3XTdaqjLKXQOnc27SDjtxKhiLdMRUk2kTaNNmTgWXsWCSTzu5gf/tl3o9XMqvHdrY1vSy9xrnDpuc1cicAl+qAW++hZCMQZUjkIMy4XKhFrA1COt9tbqxpbv0x9Q9ss1VNWraQgeptInZ7IaFBlJc6u+nTcvz6ogdkFt40j8sau25QInepI/mL6pj8jQMwALstZnF6yaR/iWOojmc/1WrNigWzzLvsMxfN78X44eFNsybFk1ZFEtPrC1+aOKZTeauQPzvJwHiBvR258rinMtE8S3dDhqYdKYzZxMvhGt7uKpKOOKflDMRFQn/ZeYVPQvUQUfK/wOxiHxYZ5hx0x2UbHPKnOjEybEHIizjrc/gPPBvJ1eojtcALSKn769avl5Hol8WtkVLB7Ml8YKE0aePF0/wujiGckpSJ/OKQbmuO1zRBFuYgmoPd1JQWv/TWQ2zQQC2EHkJE= X-MS-TrafficTypeDiagnostic: DB8EUR06HT256: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zQeGASq0+uTRWn0FYOvkJK9NvgJNYH6R//Wao7DHGe3H+UPBFNKKjBbGkPmmt3ZHqVMyOxWFcIc3e8FsGobbuXdG2WmK4T8YWizC23Ua3IMKOnNcRU3OCHvGFa2cDUsoHhn+as9nQr45JrzraiOSssxtxpP9HYy0d1CxEI+mjYy8P/tGnCi7ghsDUVReqxOAdMsEzKqCcantUYm8HM9EBiLmdwOMDL7026t3s1af14phWeA79PSKQz6V/kwBIluk1z5fN//dkugWC4iY4Iq41mYU2a69hlXMvM4t8v3MDtKfp+7ysNO57D6p1y2PVVB6X97KYphT/zeAYHtjzxHrXllPSKvcq8BF6ZVAz6HNSiTVOombFrNwH4MkELLOxtstGdzxIuP80iu/ZRQGdlIhZg== X-MS-Exchange-AntiSpam-MessageData: 0lrOGC1Rd4C7wiqG3QPfk7lTM5Akn7TKUZesB8yn1K9eaR9XjIj31fn10oYPPzP9iT5Z+8ZCswQn3Qb6js4UFUlUEmZFTAawmiqipXLaDQV9GsWuebL4ZsIuXEhNCIoKrkmJrPltRrwByys6RUIILA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4657c83c-ce96-4153-da6f-08d8fac6733f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2021 19:42:31.8777 (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: DB8EUR06HT256 Subject: [FFmpeg-devel] [PATCH 3/7] avcodec/msmpeg4enc: Remove dead code for inexistent VC-1 encoder 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/msmpeg4enc.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index 59a18532c2..7147015042 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -492,8 +492,7 @@ void ff_msmpeg4_encode_mb(MpegEncContext * s, static void msmpeg4_encode_dc(MpegEncContext * s, int level, int n, int *dir_ptr) { int sign, code; - int pred, av_uninit(extquant); - int extrabits = 0; + int pred; int16_t *dc_val; pred = ff_msmpeg4_pred_dc(s, n, &dc_val, dir_ptr); @@ -527,15 +526,6 @@ static void msmpeg4_encode_dc(MpegEncContext * s, int level, int n, int *dir_ptr code = level; if (code > DC_MAX) code = DC_MAX; - else if( s->msmpeg4_version>=6 ) { - if( s->qscale == 1 ) { - extquant = (level + 3) & 0x3; - code = ((level+3)>>2); - } else if( s->qscale == 2 ) { - extquant = (level + 1) & 0x1; - code = ((level+1)>>1); - } - } if (s->dc_table_index == 0) { if (n < 4) { @@ -551,13 +541,8 @@ static void msmpeg4_encode_dc(MpegEncContext * s, int level, int n, int *dir_ptr } } - if(s->msmpeg4_version>=6 && s->qscale<=2) - extrabits = 3 - s->qscale; - if (code == DC_MAX) - put_bits(&s->pb, 8 + extrabits, level); - else if(extrabits > 0)//== VC1 && s->qscale<=2 - put_bits(&s->pb, extrabits, extquant); + put_bits(&s->pb, 8, level); if (level != 0) { put_bits(&s->pb, 1, sign); @@ -596,7 +581,7 @@ void ff_msmpeg4_encode_block(MpegEncContext * s, int16_t * block, int n) } /* recalculate block_last_index for M$ wmv1 */ - if(s->msmpeg4_version>=4 && s->msmpeg4_version<6 && s->block_last_index[n]>0){ + if (s->msmpeg4_version >= 4 && s->block_last_index[n] > 0) { for(last_index=63; last_index>=0; last_index--){ if(block[scantable[last_index]]) break; } @@ -656,7 +641,7 @@ void ff_msmpeg4_encode_block(MpegEncContext * s, int16_t * block, int n) s->esc3_run_length= 6; //ESCLVLSZ + ESCRUNSZ if(s->qscale<8) - put_bits(&s->pb, 6 + (s->msmpeg4_version>=6), 3); + put_bits(&s->pb, 6, 3); else put_bits(&s->pb, 8, 3); } From patchwork Thu Apr 8 19:42:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26814 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 D9F2E44BA1D for ; Thu, 8 Apr 2021 22:42:56 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AE14068A628; Thu, 8 Apr 2021 22:42:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2048.outbound.protection.outlook.com [40.92.17.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 326DA68A3AF for ; Thu, 8 Apr 2021 22:42:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WNY1IrX90O2hnSYQXKyYtJV1SCbYFLmL3dOgR80TVHLkXaTRKDU6KSOXf1tkcDPLTlc6BPp1oJzK4tosgMhFHrW8PPOO2JLkQziD37b1SQEX4L0+TvpXY7C3ZCN+vR6C/1wWKAgh6mOaPuBry2EPZtdPyD5ScQ7/mDGZqKSPpgO0c8vo/FzL6B2bES5oYlzR2hY5lZlReuLBN0xv+yNLh36IB9aT1gQO9KAakL442ewrneOUMV8uGG4U71BHWEkmOKqpZzTR2jmLCGTXOVR3nYFeUqOGWuEGV6fqqC7N8XmzfB918VKlIpPoEaF7Su/CIJWW9ahBkgM+BcKJwX8i8Q== 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=QL70hRkXln+JQVirOfh8xpDiAGO8PH3zJO4gO78UeP0=; b=AXnGbXVAseS3pILq3DTpEzQeurcg21tPZ60eAtC4jQuyP0zcrv/jPKH8vPFxDcAP/r1SQBo9Zr7PSR3/a3Deb8G4TwDvAD+s5P/l7Vsk+axPbJ8VWJrpXCC5sOr0oWDbDE9lBdBjEL/MOCHKnxzYVqSGKbj18imq0xEkM0wmEbkaDRlkE7mueysGhx49shX31NBi1wsASKTDSzafymS9VquAy0Nm4Uh8fyoyUgi9jHymgZ9MntRvV5GOa+dYLXOdu43akkCVcAIFJcxrgCp6scu+7VQTCAxz39BarZEeQ6EcBWB/N52AJpFor01uRMSTTku5f3GEEyvDLfRkqIg7xQ== 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=QL70hRkXln+JQVirOfh8xpDiAGO8PH3zJO4gO78UeP0=; b=Zsm5l9RKt8ycooDXyTSN0sRR/a5xGjpjMMDoYzTJniBBmbreH+yeixaUuytaKXEPTfIPxoQB4ilcmhsSzI+3CAcB2xhYe7osrbyGfUYSphtAlNR5qRRqKJyfJrNgBhyl3RrIW6KQhpY7HQSEKiOJ3E8YYzq/g2sDqiEw+rzO9IaCPQvpw4K6eA4sgR9bMcoCcjJDWBYd7yd83FgESsk5iivbc8TvWoBDChW56dFiiSmAL3vHPKpXTp6mrQvRLdBDp5FqFk4/Uj/xu5SgowlUZZGEJ7JpMHzsmq95Lk9XyciJsv2OcAxuTpu4SOdswKP0p9sic9yxxieNf68CVNZi1A== Received: from DB8EUR06FT049.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::43) by DB8EUR06HT120.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::496) 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:50 +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:50 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:22740ED05E214A21A9A2DDA281D5344B4BD2862AFC7CF8FE334A458DAA481B39; UpperCasedChecksum:1D507A5F4E5C98D2AF366DC5F33C549654F5C0A0A6E9D7BAAEE84649FE34507A; SizeAsReceived:7596; 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:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Apr 2021 21:42:17 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [Wx7HS2tI+j0y7Uy9XI0RiBXomDlc4pv8] 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-2-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:41 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 050f9870-6850-4e7d-9ef7-08d8fac6796f X-MS-TrafficTypeDiagnostic: DB8EUR06HT120: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mEvZlEyemUuzpidE5l2qRioB5hS7h0p/t2rn0nvW5NVBkbxTjedAtC7Gv10t5YCj3dfgzCOYAKPVi/YVdXa+aUtM2ppzeKQKS3UH4fCMimmMbUQq9L5W6R/6jzbTvhdRWyuk4kv8KGYKVZlKXa7VidnniypcaOvsiMaeXdugcBxSFC4oAPPzDjg0RpBsVslD3vRhlGBDnzUuJq8CAAiK4lOo5XXRg+vYXySSd2Otd6E7nRhcZblLkLw5FTlY+M/8Cl80gyyCkbqjArJkUtfZVR0kFHd57+GSsYn0I7anKfxXqYbae86zxwTam2gD2L2oFwHQCRWLKWwsLXT7QWQ5XYdqjAuRbeSEBbDx1UE6T+3ZDJQ0MsqGEexWqfYeBSxT5GR5K5Vi23/hYxvab5FOgA== X-MS-Exchange-AntiSpam-MessageData: 7w2OXl/3Da0NQdpc2XtXj/VUVm8TZBNBxL1WWgWXWzDwOpPhU8rbjLvDS8zaK+FpMhrlovVhtJ7QciToyuBiYdViiX/sfXWeSAqRZsu4NLrFlwBvCOrWemgtMUR6176I9alQHSoXb5ooQBBzLpLcrg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 050f9870-6850-4e7d-9ef7-08d8fac6796f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2021 19:42:42.2271 (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: DB8EUR06HT120 Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/vc1: Don't pretend ff_vc1_init_common() can fail 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" From: Andreas Rheinhardt Signed-off-by: Andreas Rheinhardt --- libavcodec/mss2.c | 3 +-- libavcodec/vc1.c | 4 +--- libavcodec/vc1.h | 2 +- libavcodec/vc1_parser.c | 3 ++- libavcodec/vc1dec.c | 3 +-- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 9434a740a7..3e3205ae92 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -751,8 +751,7 @@ static av_cold int wmv9_init(AVCodecContext *avctx) v->s.avctx = avctx; - if ((ret = ff_vc1_init_common(v)) < 0) - return ret; + ff_vc1_init_common(v); ff_vc1dsp_init(&v->vc1dsp); v->profile = PROFILE_MAIN; diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index cd9975d8cf..5d854b35d2 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -1695,7 +1695,7 @@ static av_cold void vc1_init_static(void) * @param v The VC1Context to initialize * @return Status */ -av_cold int ff_vc1_init_common(VC1Context *v) +av_cold void ff_vc1_init_common(VC1Context *v) { static AVOnce init_static_once = AV_ONCE_INIT; @@ -1709,6 +1709,4 @@ av_cold int ff_vc1_init_common(VC1Context *v) /* VLC tables */ ff_thread_once(&init_static_once, vc1_init_static); - - return 0; } diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index 4559a06cb6..3e5368b891 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -413,7 +413,7 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContex int ff_vc1_parse_frame_header (VC1Context *v, GetBitContext *gb); int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext *gb); -int ff_vc1_init_common(VC1Context *v); +void ff_vc1_init_common(VC1Context *v); int ff_vc1_decode_init_alloc_tables(VC1Context *v); void ff_vc1_init_transposed_scantables(VC1Context *v); diff --git a/libavcodec/vc1_parser.c b/libavcodec/vc1_parser.c index 493ffde611..1a9d3c0140 100644 --- a/libavcodec/vc1_parser.c +++ b/libavcodec/vc1_parser.c @@ -283,7 +283,8 @@ static av_cold int vc1_parse_init(AVCodecParserContext *s) vpc->bytes_to_skip = 0; vpc->unesc_index = 0; vpc->search_state = NO_MATCH; - return ff_vc1_init_common(&vpc->v); + ff_vc1_init_common(&vpc->v); + return 0; } AVCodecParser ff_vc1_parser = { diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index ea93e11588..a08f7fe847 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -434,8 +434,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; v->s.avctx = avctx; - if ((ret = ff_vc1_init_common(v)) < 0) - return ret; + ff_vc1_init_common(v); if (avctx->codec_id == AV_CODEC_ID_WMV3 || avctx->codec_id == AV_CODEC_ID_WMV3IMAGE) { int count = 0; From patchwork Thu Apr 8 19:42:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26815 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 1EC9244BA1D for ; Thu, 8 Apr 2021 22:43:01 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0715868A6F0; Thu, 8 Apr 2021 22:43:01 +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-db8eur06olkn2017.outbound.protection.outlook.com [40.92.51.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C37068065D for ; Thu, 8 Apr 2021 22:42:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TL/CgLFbfT2EcFxqc90Zs+x2UsEJDu8n2XtB3uHSVNIMCqjZwWnQcKsXqJhLbrot7MlR70dxeQZp8LQNHfAP4tV4B8pWCYnXkm5CG4TRsN9go6hYyHeYqfRzQ8nyLVBzMlKa6DSoHBul/O7xBrAVeFOUPQ3q2yaRynvi+64PBGZCPmLDqH4Fvd6TdGQ3oMqc8wrI9QrFPv3Ow7YAVUcT+S/CAjjSYOm9wM8LDxbJvtxqn89NjSowHhYg4CiAX6VUbp7ULtFFYIvmGlqtBchMJ+AhFGMHb2XvixCrvmmtxPKeaZVf4vMK8jQocWRzpzbVE+IGifuGtYaiE7O2iX+b7A== 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=BaBfHJCKKeleKLdoUafJvgut6+qHRqgAP6Pd9ms4vnQ=; b=T2L40MlmRHtbfC89FSstHCZdposyskvW+AymBQJ02mOJpsRduwO+YKqRBUwKqyTYx0glXMWdQtc02VYx0YbYPDYIGEim5XvLcabU5pPCtcT5cGDkT/k4aiJKrd7qZKZhSvLGBV7FJZf9+AX7jv18zSbuZN0xY06qXAsNgsuFBuFMPYALe3RXcx36lzlP1qBZXzevdQKmgG/B66hOo77qdGfSaR7mlMDG5Mm4uPr5oWBIl0ORpJl6nZF5wt+uge1I6MN03lZ1o5tEdRXYuNahHptqqSmTLwwp+cVMf6QYA/Ut3zBZzXwvNhLkHcNEIqW5w1STW3DNbglnv9+Es+TyNA== 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=BaBfHJCKKeleKLdoUafJvgut6+qHRqgAP6Pd9ms4vnQ=; b=Fy/hdy1tLdg7tWMBghOXuSwnJbirb+l7R2khBpOlBoRfQelbT+pvCa2T0jiKw1Ek9PX65DIo0flZxx1lXbqDvAhtw8UTzm6E7/tzjThxz7Jme3RdeqmRvEwMa/WFNWx1aDjRLaIPPJO+j+ug28zZdAm4j7HkyeftZr9D2rx4m64y5g/eEXxBk4cPWsyQXGQo7qqHo3m+Dp8PKAoGkUXcQQ8Mjcn/klYJlDlnKaBgRKMNNqajDJj9VptK0eEVQE3vPrlt20EW+zhdtdlWWzKkLqihGN0YnDc1lxw3glKp9OtrUm2oRQM2nwxoMO0es/wACCFfW1wEyH2yNldoAdRrWQ== Received: from DB8EUR06FT049.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06HT027.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::444) 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:53 +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:53 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:9496928910421D96829A72C18F1AD4E958319BC4C847BDC8C05414DD02BCF903; UpperCasedChecksum:04A9DCEDD8899080D4E25492BAD515EDC4B5A2839DE3C4C7E0106D629DBF34F3; SizeAsReceived:7599; 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:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Apr 2021 21:42:18 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [MXkbYOm9bAykZCDttvt2SWUCo546Xize] 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-3-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:52 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: ebd089ca-f670-4c3d-6327-08d8fac68009 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUUcF99Xf9jcMKqCiYf/T76JRjKMZO0LgUx7kOLnJa1yvFPmmCHmVbA0trKub20I6lrBxAM4SGfgmZGTsw48aF/1mijmwjY9pkGHCrDsYCxj1LB5hX/aYBf6oHtJi69Qa43set+ny31NTV+jEfhw25zYifeGM1fpnKWw15aNCG+2hTHsd8MN60u0PovnWCURevaEnfrf3H8aRkEbCCTueZx3yYzzk2FSzis+AydEYbTpQUdVlf4jISGv2WctlZDwZJmELas7tnO3t8G0uYPorHldwv3aQx2KiHqwxTvxNsLO+/qdDTpepJpCIilO42B9wyZF1OHuW6UOX180jVtTF1exnSwaXa7zb9kjTHtATZvfr6XZO9pd2YWWKKsQPnOopGLteKtCV53SZetZGS2kXGeU3x0+IK7sTAcG8BYlohujs3zK1y/sO51y0QgFfFc5rUsEboWRV6IPpJQh6xVLNsy5c10y7c/P3VdvTtrysm5IfHzxqlpyGj99TjmpmmirNILg3k1mttFYb1i/iZoRYnmgcXat+StxC5+Vpva2j74FdLvOSS8coXMYgdfqZyfhbDBTvZzFH9qRare9uw1BNPT5jbmh0wWv6Uek4TO+u60LIfteREliIHgaOyu+KGsLm5HI/1VhbYvzzVQN+i/2QrPQBhFCjpZmkkbVLOFEdAhzl4dtdfT27OcrUcH2yF58PQROkBiXb69yJw8gT7//1ZRZPpM7XVyRts= X-MS-TrafficTypeDiagnostic: DB8EUR06HT027: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rOWiumfXHNQTvfjUH3Yf0DndTfsRtALoQt2v52RPtnmyYQPs3F2uSjPew1ktVY2DFW10UO6RoN/vyxLUqDtzYFtLrs25MexR03vZ+30Ex5CfXp98zp2rxIyywI+ooKAeQsYGr2Vr2R1UMyyAp+UqIjnqEaEPT9qNACoP6oPUiFdjwUZLFA2G5l2WbCgn4JxfSD85lFDgGMZeSTUslJPJaWmIgsJIHLOCYXg7m+vRo4sOQYKjxyd3ozbKIqkE4J2DKsZzTxe6buXrWvHw7bbpjcRy9OLPwFum5GzNSQxeqMh1RyFlNUxaGJaByp07Cnm8IVeCIhM5J77cMCGer35I3p58As7A3kdXR7DQ3+RfZDuOy4c4sb7QYyAZhFnylgRug17UnTzehDKO4vtJn89fmQ== X-MS-Exchange-AntiSpam-MessageData: z8566uJQj9hgiz0i41dbkB5KOupxsPlOa2dRhXQsvH/jzlMw8ZUNswDQYfoH01yToOR9icYdQwJAHaq8JO9TUbwT7UwtlnLNDbnW4bcrn7gCxGVFxZWeBGOUwNmVKHtPxH3buwuHSfuGKHUgCTQ5pQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ebd089ca-f670-4c3d-6327-08d8fac68009 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2021 19:42:53.3461 (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: DB8EUR06HT027 Subject: [FFmpeg-devel] [PATCH 5/7] avcodec/mss2: Remove redundant initialization of vc1 dsp 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" ff_vc1_init_common() already does it. Signed-off-by: Andreas Rheinhardt --- libavcodec/mss2.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 3e3205ae92..a27fae7559 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -752,7 +752,6 @@ static av_cold int wmv9_init(AVCodecContext *avctx) v->s.avctx = avctx; ff_vc1_init_common(v); - ff_vc1dsp_init(&v->vc1dsp); v->profile = PROFILE_MAIN; 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); From patchwork Thu Apr 8 19:42:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26819 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 F0FB644BB05 for ; Thu, 8 Apr 2021 22:43:05 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D8C6F68A6D2; Thu, 8 Apr 2021 22:43:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2109.outbound.protection.outlook.com [40.92.17.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53E7C68A76C for ; Thu, 8 Apr 2021 22:42:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d1Z5Gy23hBbXsPOaq2BIdZZJoYfoj5o8Vc/2Pde6vkhcjKtNoZ3dOPdCq3sdUDQm0+uKfAt/3qHASTuGynBtpq4aVha74vBKhofDTzaKAx8w7SWfZBFfW1O00roBsfquIGShwjtl74WIfNEObu/aPI41PJV2FWw97OcLkmBJWM5qXScHBHVNifbtN9+oSZ+T2vKZXb9LuCpibyCFN2qkfabaQKAFccNvgifqrGK8IqPgsrGAby5OBcPo2AOTlGRQsw3nG6HA335XpflHOVRidum86e2c9C5z/zG1r46OHN4cPfnvs01nMR8Vk2brbtHv3jd49x+C8O6WqZP90LbGVA== 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=bSXBbeCeN+L5MNKD20Dn83AEYxr9qr0KgER+gikvmEI=; b=YD81xSnmuxiirtBWgNt1yz24zUw1vXAwairQeCHkiDuEPg/z7dQ/uIScKsR50a+e7HQdDLqsnNryOm4v551SiwFvmv4ZnvdOeP8u3xc+4Y5ervzHa4MI4YzRr9mXPUgRttcb8rzEx8IBHtcMlefMAdQxHoKBiRh+7bcoERBNmkLletYcrSuvLxYqXq/sxMHmL2kcduSX7JZ/ZP6xS3yRbnFBxvpy9Hppq1boW0zI8nWRaQhnSxkvx/6rgC5Nb6orC7UforoUt4jjvJEmiNb+hjSn3YKW2YpIe+h0a92ebHZ290XiqDF+J7E7AmxExL97gHNTJfyHnpoY5pFU8OGqTg== 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=bSXBbeCeN+L5MNKD20Dn83AEYxr9qr0KgER+gikvmEI=; b=Dy0vFmP4e9B+k39TYLVhwOsy45kBGshlyYnwCEsn9bP2wYWXsJv0vTssnCi5u3XLf82pqxkRrXlGGhFaf1irglXIC0PZJbJGshQe5A0Kz+mGUsU06qwSV1h5t3FMN5mP1i0Hgo4Kw21XeO+wKDLt1TzpmBZ7rQiQ9XSSucr6NbYb5oWNgcGL+3uKtdf+oxynNeZgMDyG8h+3QtuMv0BElmtLmndtmob8XI6rZtkluwYIBke5yEX5KI0r6MTY9RcIUi4VbAcTDyOSP+7vqT+J05ONoRBgoMQpaHdlN/z33f81wy0B91c1/yPoj+adNQUvxMKB9YKRmIATPSPlPqn1Vw== Received: from DB8EUR06FT049.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::52) by DB8EUR06HT004.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::148) 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:56 +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:56 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:3B915CB12F764ABFAA21E969615D22F2041A01AE119856D9E5567BD8C43F4D0D; UpperCasedChecksum:0E73E42B53F62D87F14EFA4094656BD3844271F43706B77302DC1792C842B7D3; SizeAsReceived:7597; 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:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Apr 2021 21:42:20 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [WM5R0+0qeS/ndA1skUbMIqAzsWywtrTh] 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-5-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:55 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 0efb653c-b464-4c9e-f8cf-08d8fac6819a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQDZtlYU9il0kuGVxzoXM2vdl9cBczZrbyY5gR1mW4mkpgz3ftC5MK59/MEF1L9g/zKF+hb1vldJY94DmYMNdPeFGzog9FDP9J3FCfZXKZcuckMGa6W74FmQ9cLylZnLeOuuQmtXp1Ik40ksqapDpszENFP2vbPpgqOS0DNR/pWdydWaFtzltpP4k/pLBH6n4zDBMiFK9G4/6d8VsqBQDUp3f3+BiFlQ/PQwzw94F1VtaImuhHSNDW20nC0m0GhgASu9hXTTZ5g4kX8wYceSn3n7glJrFbZj5w3wn0hrvrodCFeEWCZo7f4heysf0lkojQPhMZpq1mLJ1eAYA/2hg3It8OarBnQ2KKUMx8Lqpn+cleWmwZfv85H69EptexlaEjfLCyTAzW2vQQYKXejfR2uxettJB7u6Ggl8vamCBo/yu9LfRnrqL1odWWttGmXbKRYmIriWY0YYQcBoeJrgjKI5y+V5hvwsGdViv/K0xO6URxiBbnJzhSWEzi8JjHEkvhaFfvARfbS0Vb5SbxvmEJxuxDyb3YtQT/F3o77bd3c/cfDp0ta+W6d6lFuJXtSwY/ubqMr15CO5RVyu8Bl1FfkJ2kXDKPFIVKCYYjCuCJ4cMvlzZkawGZ5BuWWkXvnagGLfLfWeGD8YZUYMu6ybYwga7l1b48X7SQd1bQH0X6byoCo3pIA4ok9tZWpUFUpOY4FekxzIm627ieIYdyNzO7Y8A5IEhrM9+CgCcM+Kx6k4LcXoJjdA7oACnqTFjUpR2g= X-MS-TrafficTypeDiagnostic: DB8EUR06HT004: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CKe+zzlKp8wDn58AETUgwhXDi+sWe8jtpMMelBID3NOHpFaohEuJdp8ous7f3fne/PwOuXqLxBHZ5L1p2oL3iDgWeFbfOqqU9McLh4F7PZWffw+Bua0ZFG6QSIN5FNHBsQy9eXAcv5WjJOBieTWl5iRBIS7lFxFhbsdM3c9ZUEOa4cb83UZFVD91kONunZFbYfy7u+LC/Rd3ilwNnnbVkWeRp0ntXmTeWPQh7FxjLd1bf0CvNmpwl5kteEG5K2cbRg268R5Rw1sw6gUJwMncisFwITd3c4nXzm7+fIrBIRyilGIqa1aYY9WISXnO8h7zKWL0iR6ofSRVQ97527Sb32yB4SbyRnQQdMOofnvHuMznO5lwnfYChSa9PI4/q5OVf+rpun5BpKXqm1c6La7sVw== X-MS-Exchange-AntiSpam-MessageData: rZ1kZQdwSecITeN5UQiab7d19yjXvS7pKf0hSiaGy6S02y/bow0Psbq+Cj4Dy5muGT+MZPhSoq+GefW3L1PLNXDG5FS/EIm6+1kPzPz3PMg1mPKqIsurl+8PcF21Plmo8JB23DN6CZZc5V3aR0Ibhg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0efb653c-b464-4c9e-f8cf-08d8fac6819a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2021 19:42:55.9500 (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: DB8EUR06HT004 Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/msmpeg4dec: Avoid duplication of VLC init code 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" Signed-off-by: Andreas Rheinhardt --- All the users of these VLCs and of many more only use VLC.table and nothing else (the number of bits is hardcoded). Does someone object to keeping just these pointers in such circumstances? libavcodec/msmpeg4dec.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index 63f9faa1bb..8fcd5b94cd 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -356,18 +356,16 @@ av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx) &ff_v2_mb_type[0][1], 2, 1, &ff_v2_mb_type[0][0], 2, 1, 128); - INIT_VLC_STATIC(&ff_mb_non_intra_vlc[0], MB_NON_INTRA_VLC_BITS, 128, - &ff_wmv2_inter_table[0][0][1], 8, 4, - &ff_wmv2_inter_table[0][0][0], 8, 4, 1636); - INIT_VLC_STATIC(&ff_mb_non_intra_vlc[1], MB_NON_INTRA_VLC_BITS, 128, - &ff_wmv2_inter_table[1][0][1], 8, 4, - &ff_wmv2_inter_table[1][0][0], 8, 4, 2648); - INIT_VLC_STATIC(&ff_mb_non_intra_vlc[2], MB_NON_INTRA_VLC_BITS, 128, - &ff_wmv2_inter_table[2][0][1], 8, 4, - &ff_wmv2_inter_table[2][0][0], 8, 4, 1532); - INIT_VLC_STATIC(&ff_mb_non_intra_vlc[3], MB_NON_INTRA_VLC_BITS, 128, - &ff_wmv2_inter_table[3][0][1], 8, 4, - &ff_wmv2_inter_table[3][0][0], 8, 4, 2488); + for (unsigned i = 0, offset = 0; i < 4; i++) { + static VLC_TYPE vlc_buf[1636 + 2648 + 1532 + 2488][2]; + ff_mb_non_intra_vlc[i].table = &vlc_buf[offset]; + ff_mb_non_intra_vlc[i].table_allocated = FF_ARRAY_ELEMS(vlc_buf) - offset; + init_vlc(&ff_mb_non_intra_vlc[i], MB_NON_INTRA_VLC_BITS, 128, + &ff_wmv2_inter_table[i][0][1], 8, 4, + &ff_wmv2_inter_table[i][0][0], 8, 4, + INIT_VLC_STATIC_OVERLONG); + offset += ff_mb_non_intra_vlc[i].table_size; + } INIT_VLC_STATIC(&ff_msmp4_mb_i_vlc, MB_INTRA_VLC_BITS, 64, &ff_msmp4_mb_i_table[0][1], 4, 2,