From patchwork Thu Dec 23 09:13:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32862 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7106235iog; Thu, 23 Dec 2021 01:15:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJzfYwzkNR6e/mnAytV7YUinkUBXk0DUp2UqOYclc0BzOeDDo/w9wB2C2AxKFR8UKeU9SPL8 X-Received: by 2002:aa7:c319:: with SMTP id l25mr1241869edq.91.1640250925143; Thu, 23 Dec 2021 01:15:25 -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 i24si1953650edu.443.2021.12.23.01.15.24; Thu, 23 Dec 2021 01:15:25 -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=W0ZTHsll; 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 8F6E068B191; Thu, 23 Dec 2021 11:14:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2094.outbound.protection.outlook.com [40.92.90.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 837BD68B177 for ; Thu, 23 Dec 2021 11:14:13 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KmoQCDJ7BERVtBs1PH6QafcnGlttQPKJrB/Fi3ptM5gXNL8Ix5SEe/+zobbK2QwajgKE1fg+dXbeYuOlP5y4Hja3AWL2HDDF64NU1NUSqF7T5U2hW/+5u1s2qzRvuu6mAzL+m9bKAlIaYSDMUqPxdnBHoj/Ib0OxLXBfCAJIZzLFs3dkzRMCsPeZw6hAW9Ee4g4mg/p5p7/I63lc3aPTQmgzvCNscJ4nI6vMVD5iqTeBITLgr2KdV+wH2W8ySvIGzLpy8dYcr/QDbLP/YviageE5NpeprIHLCK4FQtjgwImlbhom3kj036uk/WNMFT+SpEB0Ap6B7CZelof1XMiM+Q== 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=yTvwNoIGTo4P1t1kyBJ9+NCunsAS+ATK1oZjRa++L+0=; b=O5xB66qFptNsdGugkz0+ee4otCOClMbJ5IPZEK9i0SZTYnHqLw4wNaQtpDYXc4O9GSiq9YWToDaX/ZQWWhu1zokoAHDa6GdEXNmGNWISTUUBLuitj/MeYfeY4t5a401xJzy7pTRdXuVAey+okjLyizY7hL0su96+THFiL9Mb9GZ7hT6mpPGXMtaUMqAr5rXzPi9wfJ9aCefNB760sX2cCCN2s7IHjMTGb7PdWT/RW6NER1u4Eyl6RNK2JfWBPfVOrKPgmcGkrSw7v2NMOjQI4vHOg1dcmLSZxWHAGy0305GH7IdQk9PUoptnngThd+xTfeFKeGN5rOf3PuchnIk3sw== 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=yTvwNoIGTo4P1t1kyBJ9+NCunsAS+ATK1oZjRa++L+0=; b=W0ZTHslljXaYLLro37t9Mu93ENxooVoGSsYyAGnGm0D1U29eg/e5YhPra1rTmu6WiuOUIAzlLRyqhngVm3QP3gMQdwKzjG4npktSMfzcBqRu116+1v+xiEkDPs8FX8ZzCnMgIKBxRnyvRyV20qghuYjFvxXcXKy3MJNY4oOo7LfojtWkrK1zzkH3ZYSplLD3Y19FJ43YshZ4Ml2cqWBnwvFFWyGHas1LeSuvVUn0jxUdwFokE/q9+luOVayyvw8PmOjYsM877NHaH+V+4HMGVKVxv7X+KWJhmc3C0RsqGElQqgOX0QmyhKum109jd34LXUhoXLShwCQtRqaZ7pn8LA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5607.eurprd03.prod.outlook.com (2603:10a6:20b:fe::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.18; Thu, 23 Dec 2021 09:14:12 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%5]) with mapi id 15.20.4823.019; Thu, 23 Dec 2021 09:14:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Dec 2021 10:13:33 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [f8snEkO8toLwO31fV2+O5SLQoEhbjkw8] X-ClientProxiedBy: AM4P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211223091340.1450013-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aba24a16-cbdc-43aa-e3d0-08d9c5f49599 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JU824tqoqQYbhKvwxtwowR548qNw28oSsD7v0KXWUYD40V4cmisjGlTK3VzLQr10QOS5H+g+XcLOh39gwcnEqVT5m0gFJyKgnptyeXw9VClgirIqrZBhBwZUgNrGp0kryJtjeR8NZzvdfofeZATOhm0KG23oPFf0GlnhTlgwRHN9kbNlnpLZaQjjfhP1zcGqLDPNhPuqM3CZw/f0AqobZdlmDiEFOoDpTeXuNAheEU+3RWUXwbJaCtfD2daFSEGR+54vxreFGYbb/+XQwiquxvmSnzgIuE5r/rj/CEYbioT0W6kEilWiorGzt4VDelT5ucipyYqasGaEc1FohLK1WlxPuCU4SPQJxvqdEmvszgu+fu3f3keXIbKB+FQylYNv8Ct5kEKlEp05JklwgIyssz3EOfcu3GCnKL25HqnY/LhCatG0WxwD/x4hh9xWuxgwfrNnT7ZU7i/65I6wU5cy29Y2464+w/XO+2tmOlssEcj53CT4l4aD2cr1+exllXllzAlpCXivE2j6iI2fEeyXIMGvssmQrbSuElyY+8ui0ODoQNqzPuu4W9PfkESNT/d3oE9ce+avjBhgAe5r9K2ZQ2uVU21PpnMaM3jhr4DvaIvlG0hc2mNFnvcv4jXotCYFzdEbeU5C0vMWpSxSlQQ4U5G8LN808cFOE8U68X0VuwWvjRMV4nFo9O1EeRGbVa7rN9LH6UwZGsjNlrYQvCMNxYV4cwJjnwn2G+yPQQvBGY00= X-MS-TrafficTypeDiagnostic: AM6PR03MB5607:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Aikkh+UPDytRBD/b9RGhne31u6noQazwrmoaTmXCns69/sjzAzHjFALE6sqCfrJJdN3HB02+si5SW2Aq9CN6MsxXCy9SbM3bxDor869ljnVM+OqfsiqOoBghV5rgp1r2g9WzoKjbvxZyQXxTH3vlk5BSys7rUAZ2m6C5FBYCbIQYh1avIykVrpeJta3GaqfWc/GCBagZCNTCQQToQY3QpbnjGh7Rd1zSUXqkhh5WOcCbitBp9jmRRg/QfvSSUuOSA5ZJAXldDH6yzkfYrcew58KNYF4XsLZIp7QobubH9rxFvhaooTuKhe0WVF3XxCEa/gy7xuQWXRVgR69qocy+dAmsbPulSl88pVpSPYs/hjkMSAKVWFlE/qBH84ye2HH4byXTBlHEBOCiwnTUBC+5qYRDd1Z0z1M6XOe1TmoI+x06RZogTZJpLhKj5E/8J5CxZUpqrE7iMSdq1STxc/zaZRkzSqjjF3ORCUh2IJ3JZEPSm64vcmdMUBUXehi/oyTYTPyrCa48TFfiMGJNodjnUgpLRxBdqAIKjyN6wWGDqxBrtLKhEfFltpWyoF5sjEj7z/r/ThD9pOPifVnx3aGWbQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mqCCznr4cmBuvJ0lEnUbT14+Pt4XxhyT7Z5Q7f7X68ewZjKNIk3dag5y+e5bfmr7aeI9cF1RnndlCC+ZdtQYcn7adgcvxpR4YhA9c8KLY8VfDlroLT38cRiEsXAkaV7QePJb49zfbgYuOnZ+R5kjThS62BL9prhVRAF9NUEWsvXpCmfU4EDNbPrWKJAWcfAQMDgw6CCadAOkT8D7O4m4NxdZwvfzFhzMqkaTnBLoBA2H/aoMCJFbNnMDFXtnoPWavZr99SOv+jXhfNcmTDd4/uBu/+BUfzAHD44jZmUFxTgNsxrbLZsdH0eSH6D0PawKk75dqnW+DLpLtzvm/ijVDknrqnjTFVVdnDdZC80qfLovYbN9sT7GAErf9B9/XO9gxuyOohWm4qtAOYWr6wFyenzyubSiT/HPsKJ6e0RkwA9g0VVBtX0Dwkv/zEcCmt+K+1Co5DH6+IOduHo1mAwVrIixvf7RKIRdLvbRw78tB4MwxLVdFliGcmuHGE6zBqSaQpkPO7eyLBGHJ34bdzCl0D7Fba3UadkvtM3L+nBGF9gYy6cIiSlOWAdDgTUYwE/afHLLFeSpytGDVcCOZmqRC74EzwtwA0tUf8ziA7fhGRPJ+uXEhi9hPjqM4d1eulXeEVFxZ984JrWIaVTbd4PKQ2swJIws1bBC1djkcupD4CBN7p7dGnU8EuQI8yz3W7HTcPKWIl0+0WrfqCjWG6SE7UDo7GpHdNcFH8FvVx48gdI1QOZRy5jCkMW1Hdm7VxUK2yrUA+2ve/EFwevnXJrmpS996ah37589WHAauupI7LXk5XYiFswBfhK7pigravuLRo9XfPs+R94pGcB8WliG9BcNblWaVtTk5xHvTC0pOO7llSj8+Qim2FUXrry2/Ito13irubj2u8f5TuJ0LbOo1K6MOSK4L7i1vDCyEc4AWYKNjmo033LtFnNESBXLgCvUUpmQoe2k8mLQC9NUUTCCfw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aba24a16-cbdc-43aa-e3d0-08d9c5f49599 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2021 09:14:12.4093 (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: AM6PR03MB5607 Subject: [FFmpeg-devel] [PATCH 23/30] avcodec/mpegvideo: Avoid needlessly calling function 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: DxYKn/S5b5Zq The very first check in this if-else if-else if construct is "if (s->encoding ||", i.e. in case of the WMV2 encoder the else branches are never executed. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 4c3e0fa8bf..3a42e08a04 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -2122,8 +2122,7 @@ void mpv_reconstruct_mb_internal(MpegEncContext *s, int16_t block[12][64], } } }//fi gray - } - else if (CONFIG_WMV2_DECODER || CONFIG_WMV2_ENCODER) { + } else if (CONFIG_WMV2_DECODER) { ff_wmv2_add_mb(s, block, dest_y, dest_cb, dest_cr); } } else {