From patchwork Thu Dec 23 09:13:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32868 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7106920iog; Thu, 23 Dec 2021 01:16:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJy+XHL2i+E+You9FuXJZSqhYofkdKg3GuJHRy62jW3bmHsQH8yslPC3MUk2ioJqmRw7/wAe X-Received: by 2002:a17:907:3e9b:: with SMTP id hs27mr1226940ejc.590.1640250990914; Thu, 23 Dec 2021 01:16:30 -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 w3si2282889edc.398.2021.12.23.01.16.30; Thu, 23 Dec 2021 01:16:30 -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=VMLNU2VI; 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 9482368B1A6; Thu, 23 Dec 2021 11:14:37 +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-vi1eur05olkn2034.outbound.protection.outlook.com [40.92.90.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A94268B156 for ; Thu, 23 Dec 2021 11:14:30 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VPRbVOxVq6WOOzw5d0eIUQy9K08ANH+obSLDg7visOi697Vb2mzraQCrFKWGgvjadWwc/r+cd/AHmsaYg1oBwvv31KlfmmymAF1b7bzSjI7wI1iBsoozeivJGKq3+AZjM+ElGLiGV6w0kPY9YbDYz5LnCZpfLThMMySo0j53IgHC832mgmfZ4xzAkGo6COPAVZZect/ibpATpe9yRU503zDcT1i+nIYD9z9o6+o+zXQ+I8UEjbhL1fDtRhnG3FxFByuAxlMb1QAuu2qE0Fbh/kidR1iJrxN9UqXDY4gESrJ5lQbmYVr8kBSSmRpV64+S3QCrbeN++LvlGN6/m2IR1Q== 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=ldJn7n+Zc33wvtkmTNmrw9YuWqvXoXdPm8PNbvd7gqc=; b=gWNig0rmQ1aHwjPdlNJWImJ4PKQf9mhtBrtz3W/rHzXXH5TWc0dCygzi/r648fefE21Jn1uKMj0AiJYvxl8+7G37I+y8vTSmMeJ4d+RI2GXWEz7I17dNKeVABDhIWxuI+CLhrdurAzSZpE+tdVp96AkCmlAUy2jD2RFLySj7ABGw1YxGt0VDdlhhpfHhdGW9aiqPLnnjle69l27EG3THhS6BreXjFIhWN323Qgi+4BSZTsbiigbJJ7nRVEmMNj3AI5chOs7zKwAo/d3n4C4GNkK5FXvkWrsntR3dUGXWawE11Zh8a5AykCUqqTJzIPcyOkn80S2njaRjdOcCBNYxbg== 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=ldJn7n+Zc33wvtkmTNmrw9YuWqvXoXdPm8PNbvd7gqc=; b=VMLNU2VI0+eLzedvt9I72bprnY/BdKsK5HuqllYpVUEC2uRh/vDVvfzq/KGJU9N5SGmT1PQim6r0IsZ6B4NbLDFi3fX0iJZSN3esGJAm0DgwBO0gzckJzrRwkdV7pQUn1R+D8BmQspTj+8Vl4FmLdsd4g6uDizi5cdH9oIC918TG+OJB0cTnRe6tO3idQ8BuGGwEhaepp6pRGHQ2tDlgG824f5S9GlduBIuh/I0g6/PxZPElZeDjs2T3KLjTWvkv6S1CVnaJZSuVlGtGwhiOwA0BKpu/ZFMDHmzruVwcV2cXzpRyoL42qlg1+4IjItX96EJrKpjJaRS26cpvu4ydoA== 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:29 +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:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Dec 2021 10:13:39 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [XEPKf32aZYYPGwrpLegcZXEBtnSJe1Dy] 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-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6e2683c4-03cd-4364-f731-08d9c5f49f8a X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhl4WTFOkgzRnZWb+Y137S92QRcksSrev+Jidpi+nbpJUATCZ8FiCbldqLZBNl9ESZHSwfEEHQBnfGFS38MUz/li+ihE4JFPI80x6lvTDB46v+/0QLgmXRKEXjGeZR1QawhiCKlT9jPJ9AC0RF8k1LicuZOlDX4P2OaOQa8woyXnr4Q4yJfGpE+uNd1832l0KBQ17BcV+lqUmM7eZx303YAgJxQ/RGhzoW+tVIfeE7ZwPptJKBcqsycPKg/Z4ISjYrT7o3objsL7UmYUVDDNv5kctgwuAPVvgyvnH2b1bgEubHOkZYgQJrqtW3Wgba8ZlGjdbgTvOfmX57i9Txmaj1m2+iJjUYq0k6lyfHN041NfGsYuqM+ojy28eEMsqzWLRHBLZEguq6fB5nNxMwR0VbQU4toxDrfL1T7dTgme9QrWuiuJqhmNQM8az7GaYbEmxD+Xcvo9LlB8ZCdvLjAXInm7Gh1jnuSr11pKDIAf+2WVLsQEo0HAHvI4q1edr8pE/lLi0KynTjkET0IK96Jpzzooi+nDPmKHMn184VG6vdZUqLCdeZxpzhTdCJv4viKJXRbGWwMEidGVhY1EkT1g5/Is8Kfov2xxUIXZ8KAgcpW47gNcrMUyWvhxaz3tlb4AusD2QnIzPi3kgXCQAKOUyfTpJMoltJpOwUzPJ6srgpCpmayi9miNwI3Sn5fYFn1Cw9YiKe8X4SP9ms= X-MS-TrafficTypeDiagnostic: AM6PR03MB5607:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8OdaTbyVjX7Sqmus+diLcKoZDyTI4jLKlHIyidofXvISZtwZRo0b3kWlU15TR0CB5xqhCoVjQ0EHpYZ3cfAIMwHFSCBYrRvjdp6MQXpFyHLPwCunBabKbdTzvwvAt/T6u+lqa5Qs35cR1wTUnoyJrjLS06Qe/7XG4laF5cbptQUkFrqYgohdazQoMJdAxq8hf4k3NxIZOgLuTfNFIMc5vaAF9aexU52TbC+C4Vxx05N6UBsgcEDgvlwnbgUZaWjGpo7f/EFv8cgG8Utfj7ea4cjqaeHh8zndG8YHin/C0QMLpj8wXRr3flhzRGtF1x5NxzGU5n2sDnoC7BjWgVA+GrPKyRgaloxvpVbf4JMzChbzrhEpNrRD9vsM45sGPAqDtXnR4oXNyv0Tct9Kp384+lxXqZYz0mrDO8GE5xvZ3zkwRYPvcjf0N7iD8pKRpJD0EuVVrNC3H8oIwctd6nmGdEEcAwwtnsQRaoP8YNQMFfl6PtRFhz65K+fcAHtEXzbxi7tavVUdc96dquaahZ1Kh3pm0Jz4cPZ0cec+EUegA1Rvii9CFgn/vTUQGugLzV9XjuePyEZNFqdl4iPVfQekJw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 89au/fVBF+pHyBcqvVeuETa4mm1f5MEzDavbsThy+F1jrco86Lc+OHn+xbdKZIxcqV9/GJZX695zEO7bOSfoOy0vLOaNbV9nS3WaQ3h3AZwrSIlZFC9OvM3NG9fY6potTHwSb9w7aDUG2OLq/gtod71ibsDX6RHY5mb3molk+FCUQJ+2vWnrz7x6KsNkBGViOTyFpTpkmjVpKekNSpUqyyuDdh/YvcnGopPOZPjm1ACKC6kcUoh7QcxBl+2EXupBMbIY1JDcaoXR/E41wlgqoUgH6F+oLfMx/47h0OLmAMjw8XOxifg+koyaKZlLpnaIeeCK6n9MU4VGkr7CJRmZ0THCBCLJN3lcaQrTRNbBcbEpWOGWefvmnUUkPB+HIkEWibaa3SoF0bmDivlYxC2YWo1g/MiDj2NBLaOxAJNnICyIXPuDILxsoWXPF9tuz9RCJXU3viunZFEnN/cC1BONdI4sCFxfOGhb1cwkPDddgQMkLWULqEdDsx1SRK1AMv/smJmu1dRjD6vvg259g/OW4ogup9wt4tqtpPkrtE/8eNCayyqirTl6gNzDdgukUPS4o8DJhiydRP7oJjoBY4aRol6HXKOwXrjulHotZu5enSj/aDQ9+SCyD7hYiK6HleyLNCPZx2Jha/yV6i8ZYjqs4c+i5MPRggKhfCC2beRdRHvOkzEhRm89vL2AkTgZJorxhmVgdAl8wH8WXuDzXwoS/t90b+WQ/0hxMZ5Lcp7+GmiGDPar1XWUHx5V2WeoZxRr7hKBiTS763Z5/DIDCIW08BHTDqxkrjqYs8umUVgni/ZWdX46zh3mnaGGom5bfALEQr7eMTHhGDpkXzhQ8qZFoNI7EOznC/s7Hk4kpcM3TBed7IgA2/1pcYPMnsdn/Jo4nAMrhxsSyfEJ6lqvb98b54q4cirzzisvZ+Acf8z7q2Q1xSFor5NCItEQ6DGmGVMqMhKFONwn/1HnIhqVKY24Jg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6e2683c4-03cd-4364-f731-08d9c5f49f8a 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:29.1043 (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 29/30] avcodec/mpegvideo: Remove always-true branch 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: +tQUl6pctLcS Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 73b91b459c..7626f97be5 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -2166,10 +2166,11 @@ void mpv_reconstruct_mb_internal(MpegEncContext *s, int16_t block[12][64], dest_pcm[i] += linesize[i] / 2; } } - } else if(s->dpcm_direction == -1) { + } else { int i, w, h; uint16_t *dest_pcm[3] = {(uint16_t*)dest_y, (uint16_t*)dest_cb, (uint16_t*)dest_cr}; int linesize[3] = {dct_linesize, uvlinesize, uvlinesize}; + av_assert2(s->dpcm_direction == -1); for(i = 0; i < 3; i++) { int idx = 0; int vsub = i ? s->chroma_y_shift : 0;