From patchwork Tue Feb 1 13:07:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34036 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp613162iov; Tue, 1 Feb 2022 05:23:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJyszqan77mr3y2YcMiFqcs9MkQ2TeFW99nYy1KvtFRtROOJkCE9/bltNyI1hGKjHgLlnIhV X-Received: by 2002:a17:906:4fd6:: with SMTP id i22mr20760122ejw.502.1643721816534; Tue, 01 Feb 2022 05:23:36 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id di21si9108364ejc.981.2022.02.01.05.23.36; Tue, 01 Feb 2022 05:23:36 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=jvEgYM1D; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 935C268B475; Tue, 1 Feb 2022 15:09:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074106.outbound.protection.outlook.com [40.92.74.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F5B268B2C4 for ; Tue, 1 Feb 2022 15:09:27 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fctchc+1VgMX7cNqCrwwL2FF6MON4OKcmyHI2XzlDZ1vsvh/6OWu864ySjr9O7Y2jgBiqe98AC4BYo2fNx5vB2u9OuAW5rU4Um/aKo2eL04AbQ2Ohk73VYXEJeTRI/jpgaD+Dbi68Plw33N5g8CZLg0KVdCq8MvXbS/to253jvg+N4/i4OPwYXnFpRd3v9YJWxoRFdReYSBuX1Vmso5QD115H3i1PoG9ZpAzQ2LaMlsGtnvyBx1hRt8pqj829VUmGoPUcAganqZJ5/sxHopJC60TaCwL19I9O9fxh432xEWtiw/OFra947/SzxH3fKMzZ4F1D3WqFZDcUfug2HJ5Yg== 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=VVlKDYFftvOr7dW7n+qOXaHMxgku0HHODCS31nl120M=; b=ky+cUKGIqy579biHqec998vOPeUWkgPVWh1Ulhn6sBzm1ZmnbAJdJ+hn83nuPM9C2BtXvAQ4npdqvlP+w2A2egcW19raJrZgFtc5Gjq0Vss3i+7mInS2Wr1ZOIzkKNjodFjaf4B0PBAzaTvREAryeQu65IHuBX26BTIk53X0xAp3cmIhyO1wW6TUWRGW3PSr/QEnVNyC5P3dwrjmdbzhSYaPlqO+RnvGgJG7vwy4kLg/OZcIhi5BBDE5VCpOfXOnZa2FLnLiDAqwHHcB/iHZlMZxUkUjNpW8iWeQvhxE78uh/wpbsnqU3lgedGLCRdQB+KXzMtkTjdl+O5Wk9ksmSQ== 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=VVlKDYFftvOr7dW7n+qOXaHMxgku0HHODCS31nl120M=; b=jvEgYM1DQbt8dyqMjkJ+Wq/lpLCAYoSrkGx6yIcp5FEcelwUcXclZVLjyDECBQLw+DVEELlKzpeX/LMR90oKLk4hJV2ez76PSMYn84pToOA7uyHHuJrirS3oyCU0HveuDxhnLy1ohVigl+MLOs3pvwRsFeqC5sjHTs7RpDEdKHEiq4rLMDBRuAkdAe3iZsSzwmV0SVbI420EtCsIEIA4g/S6eGQkLWOrD06plhn2qDFkdGqHOt8tZ2W2b9IAhRlTUBIZovxESyZy5suscIoed2qWFbY89fiBrlMje3rspqw8Z6MDAYFqIjhq2zqdpb7nCyRAp1h2E391CbYdemfRUA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM0PR03MB5025.eurprd03.prod.outlook.com (2603:10a6:208:102::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.22; Tue, 1 Feb 2022 13:09:26 +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.4951.011; Tue, 1 Feb 2022 13:09:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 14:07:04 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [SAM7MfU8lcnkYUeiOsihlX3L3FI6k0xN] X-ClientProxiedBy: AM6P195CA0092.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:86::33) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220201130706.1420875-66-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 37b70b24-09b7-47de-0704-08d9e584023a X-MS-TrafficTypeDiagnostic: AM0PR03MB5025:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eAobDiEV6Yf7NvLE778aGJBgj88Crfki9T+bO5hAvLpFSWkDfGrbpkMrpXYsmb3h3JJ0YjjGnBDVuMFYdgy0jCnzikEA+yvmLHWzFYlEeFtcUdJCnfJobz5muURcIreAkXxxk5V4XTVEfAMNxlAIb/vO27oKMXIMeVVaoFjHDbKppLmbs2HmaGAlNWOwJOptSQMFSYnRPzP7qNT+a8AovDgU6iYW7Ia7s9Iun+HFAFDHMoCCZDch7aTNpzZl5lNgkJEU0Jv4zAhtU55y69ACG427ng52RiWvqnpIR+eWvXUU3+i8veWz93bQA1F6R6x8tOYkQSKeqk4xuZpJnVd2mqI8YYpa2tIDkRi3LpELA2P6g8gG1/kW0ihAji3UDppsb6cJR0ZwQxXD5uzm8eSpeOouxQ7PEVbzQsb0ChMpmjTUIu0+ZgKVJpWz6yUsXPeY1T1WgiKowRU3mO49SF4omc/V2/UNqrsT00tkrVzNb2racIVow1d/2id58KseeJ9V72VLLBx55qatGZWIJNN2rks1yPL5G9mKOtorrVJ7txnzmp2MCkvz42EB952VQhzT X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5H347+zBeYpbIWw+aVnxM5zcSeagFseHSe2KI0ED2orxyEOyaFCFYcQi+nsLcwR53tFGMWU8tlK7f1qoENftbUXqjP4Z4lYOQauvRonh+tFpi+0Qj/mfrvPx/L5dnxbi1scLJNt9kc5LBLaaipas3PBj+JjweDDUjd3e+wMTs7IKeez/uFiQDCVX2ObH4bB/DrF2u5YztYK+XzbkKjjJ07X6EgzESwsmXiQQM8AvlOSyDntqqtEfzMEAmzF8aZUqmjfZgR3N6Z0MP4gre6OzBMkJPi3Zp6lYFbN1jznrxSDrzw6Z825TT23RCXHCWAzvk+Ks137I/BlbKAFwR4i2tbEMCm1Xheu7gRC4HJrTi8X8O2Sxa1sH63o62UBmSct+Pw1ncjcGsqC90HwAzOtgxkMcOEp8+ukJ6jbRvBzAUnNFguA/ufyS7p5sIiVm3+jMA1/eI5yYz5XtTPe9DxMOkdocVlkMi4g/ZNDCqd7sf+dzI14JHNvhBJtnwJySIyXBqbi7Na9dhNsBPa4Wg6XYPSLoj79LSSyNiY/WAGUkgOpSE/XQ1tk8XPS3a2S0gSaQqr1qDh3N5WOmrH8HyUWCBWvuy68HUkUIsEI1U6mlTFADfv7pVS0Lc8G8JaZrP6zs2MP/No6UUNl3KzBlnzR6Jhe1sG6qxxf2/Y2cPo+LKVfVa2IBDIFsNgNHtsI0mPHmrwF7l8+MnkvIZ2LHEiramsdmTmBY/k3EJxYf/OHG6kebCvXQBTUeTTXnYR+w/ch658fo7wmra5egu2coDZp+eitZCsUL4+wPusSLKR/H63jAg9I4gyYy0yVThQakLnLGhRk3lzxOGGZJOWS/DXvxu/z8+y6HnSC4JP8VWCILxCTw9vU/ET0ll9CFMmdC+twr+Q6wJuRlBX2cRqSXv917ZZjOC4yQm2Gc+wL/yORjZC4WJxhllQCFcXULr+F/enshceAJMuE28hRDOcYc4nKbzQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37b70b24-09b7-47de-0704-08d9e584023a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2022 13:08:58.6218 (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: AM0PR03MB5025 Subject: [FFmpeg-devel] [PATCH v2 67/69] avcodec/mpegvideo_dec: Remove commented-out cruft 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4u1osVALPxo6 This piece of code has been added in an already commented-out state in commit 158c7f059c3906b0116ae73a7669a3bb7bc570bb. It certainly doesn't make sense now (if ever) because new_picture_ptr it used has been removed in 6571e41dcdee4655237bca0a3277df8976167aee (and new_picture is only used for encoding). Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_dec.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 48371aa886..8927a0a21b 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -358,8 +358,6 @@ int ff_mpv_frame_start(MPVMainDecContext *m, AVCodecContext *avctx) s->current_picture_ptr->field_picture = s->picture_structure != PICT_FRAME; s->current_picture_ptr->f->pict_type = s->pict_type; - // if (s->avctx->flags && AV_CODEC_FLAG_QSCALE) - // s->current_picture_ptr->quality = s->new_picture_ptr->quality; s->current_picture_ptr->f->key_frame = s->pict_type == AV_PICTURE_TYPE_I; if ((ret = ff_mpeg_ref_picture(s->avctx, &s->current_picture,