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; }