From patchwork Mon Oct 17 01:34:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38758 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1375891pzb; Sun, 16 Oct 2022 18:35:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4Fw5n5Rk4cMfG+A1Wl6HHVU2adfQIuPmn8UjyjQf/8roKlyXVZbj9CIxwIUW8+TJObDYAy X-Received: by 2002:a17:907:7e9e:b0:78d:f3b0:fc78 with SMTP id qb30-20020a1709077e9e00b0078df3b0fc78mr6881501ejc.478.1665970528592; Sun, 16 Oct 2022 18:35:28 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p2-20020aa7d302000000b004599fc7f310si6573338edq.140.2022.10.16.18.35.28; Sun, 16 Oct 2022 18:35:28 -0700 (PDT) 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="XU/J8gn8"; 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 382FC68BCAB; Mon, 17 Oct 2022 04:35:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074017.outbound.protection.outlook.com [40.92.74.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA77368BC9B for ; Mon, 17 Oct 2022 04:35:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zp0W0Af/0mn1jLe766/qzlwtdBXu5bTc4ekjLCciNN0r3+GaxrGWFo1hCr3Acw0V6yR/nc/L3ORbb17EFAOd98Q7TgY50k6FNjWzMvBxK7nUuVc7uIjlR3zM1+hml/3f+QMYmMm47XXG14NPPwHG77tWT0Bit6bR5bND/IjfNwTr8e2g0gWWN2p156HR4hBMLBh/SgFlUGgfnF/hbHfhUE9bhfxkMN6FNbaaMgl2dw5QdbEkeGyhevLXR43erHzt6r9RxzVYSMYfy4b54jgIF86NHAn5POQTGcvwNjnHlzgd8ALq+iM+W0cm/6pkHcXje9fPxUuela0Lj8/iu/dxhA== 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=x1Hz7bJteqZIsf4aNdmyMLIeX25QbxZs+U7zanobgwE=; b=fgS4hM2jS0zAzBEFSPtdNpOh4hEIADaCcJ+esao0b55W+0hVTjei4im3pwBpdJOccG5uPGF1fRj0wY6y7NdWlNHOKeUujE7ThbvBYZ8HFfrCdtEXE9uTNhh2JATHAOwlrw5bpnOKvxBR9PZnAFmA1V6VXKi38jZOrgUmDCHhBDaFLRpZJekfgo/hGHgoVCxQ2O5c4rMFZNBoamHQXCpb2xmkAdrY+nBfEzPWITSWrfyXEERaGTkqLCbpM/DMMeJ5ow0pgt4zc/wXf36d9GhHpHPoz6U3rR/ZjdwIfnTUPpxjPpME0Cqagkq4IlqQDJFC5KxDEbVAPvnSmxAexly94A== 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=x1Hz7bJteqZIsf4aNdmyMLIeX25QbxZs+U7zanobgwE=; b=XU/J8gn84rOHpk1/6KvE+hwoaJT4a8yjLUg1YdTAdXgEt0Nd5U0rcu+m5vu7Qo3OI0IoYSyxrTuNV1/P4dI54a4PAfI5BVbdd+6lWQd/azlCUko61u15Qw1y8P5XhxEc/DxmGxcMx0+CcsrIfGG6B5I+CpwdVw0EqWd2CUuB04BuqBudoXIURIlMZW27ymuHCLdY0u0LCfYg+oHjtCnKA6JKwuT8YByIDbcmmJw0BM+aMcln3bB8IiIFYsze/sIhafpoLCY7ed3fbb+GqGFODizznWcWfOlhdRs/UO4L6tR+x3TQPVfcQZLIdtOWimz16j6bGQpBzWpjKJzDHafL5w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0916.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3ec::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Mon, 17 Oct 2022 01:35:08 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::20c0:9c9e:87f:79f]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::20c0:9c9e:87f:79f%2]) with mapi id 15.20.5723.033; Mon, 17 Oct 2022 01:35:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Oct 2022 03:34:41 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [1oPjfSI4+6rVR3osQNIRWMGX2kQCnBLKlF28ngMxFdU=] X-ClientProxiedBy: FR3P281CA0056.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221017013442.944352-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0916:EE_ X-MS-Office365-Filtering-Correlation-Id: 307a2546-ac99-40bd-be19-08daafdfd360 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmriMkceEMr8g00cHUekKy/uvzg+YRX9i3I/e3cQaTfrkOKTFPJfm2nJ2pSfsGFlI2aUM1DO5fADDuqcJKyu/se+ct/HFjT/RFGwxop+iuZwHNKhe+wbIlBE4Afj4TxGB/uOn1AlmwSqTl7/qhaL+ko5RoyftFEPHbrryMxmRvpk4kgpmwJH6qScTw66qF5wRFgBijQ873EkKzzbzfIpRM9pFI1QHAuGLXbU/MAq77JDCuBueMAuGyhKqD8CWrmuCKxKW1etC7CCF6UtMjRlQHNiGH+0epzM7Y3KvNucRvvkx8Gijam6sibosZPAhY3Z+vGGabc8/HtXQoSgn3Bs82u/AAh2a4xboMJFDyBw2JGD2j5b6NY2suSLaVs4zCqrmB58E7kicubWRdsJBgtSebEK2CN7DDdylWiCM0+c3IIDWPWpsToIiCQg7aYr3saOoE24IpSnRra/nuQpKq7Y1ho2DF6vx1LlqKotXVdHFd3vDoDLRV2riVq9QyUItWCVl2cXE8t2TYP3FlnlOkWXx/d+Lc/dF/KBrFlnGFJuflfu2QCdNxK1oS6jMpLl4ycJR2dKncAjp6ofM3ejji7CRl2jj0QolVqjxkLa0a9woCvr+TcyTZ+N+PNYNhDXwi6MCvetiulZM7Wovwzie2dMw5UhmmAXteCcoAkGU7fvUD2oCI4OD0Lb/Z/BK6AR4I2Kqyel/OZSM4RjZpmC6VcVJhfA0n1Z0VzLQbGlMT2lTEqSuPfq6Yy1makKKqqAw6VvR+0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mp/3dVZgW9GhG3TL+dncnlvci/PCu3bvMPOZ8bZkas9O/655ewXdgl5o9AhBnf+9UFU35Pevv50oXAFOTJxjc6N95MIiELGro1LDVSSAJUBpW1a1z2fB+wCiF9tj8NU4lwU5pG43HeREJU4t+EkdcwyLcap+y53KZAVSeQt0KaCNwWj0FFFR4kgathyeF6jjPvMM8AoL+41vIT+iqKuY4/RJV62OCgz/Cw0AlBZceTnOaeL8GwPX4wA1PaTqL64bUi9AHyy/LfvFFxR4ogf2RXylAijMT6q/u3J+TAOo22TXgTlAY21BpuYmtrOD6+sclTwpM5eBAS6+JBf8xvVWSOjV6S648mpst6Joh95v8X9ooqx3O2tGKmageJBSzYCvqdbysYF04ULO04sSaJghsG5H1yeIdh5Z+OWkvuAYvqiqhT9LpHKUywEQG5WF+CqGTSf06/ao2FgjtYqgq8icS6GJpy9SNihf9XE3jNiwL4uXuRwLHHLTcpX9Owy2FfOSRQpDDlwCIfvN9YOCzmx4IPlANLKgCDInkBEIJiCgg7GUDXmax2uXGdpumqgI9cCEcSrV/nWwjZQEghuxHuMltfr9Cva6fYa6+nh3YomyhTadnh1sIZjHwMMM0zKCcdjh14RHUcvhBfZm2CHi5i7NcqmqjVHY1RMiPyRtXt7+1TX8KFOxECEhU/G7nEPPeVW+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wQ9KrCMxBT8OkLMW59eZnc3/CFud/GWobBj1mS127A0sVsj361XgR4a90cOZjC4LCu05SESzezE45Ow1vfpAOOdrExChcBzqPXEk7wDjFK7CNHYOnUl2xbjiMms5iyFBfilrXlqQQs1SFxpAzYys/gbYeqb7KUPS1Pg3YBlQLS55K3QjhOr426bEJeFnt2p1oQ5ihc42oZqaxFBm0mANL9jhulU50yCIQ4XseSu8CaJdlSKaMwan7HVUsIuipQXe6CODPALzJtpqx6KuFNroW07p+iu0RvpEoMAeQgiYN3a00a6Oa/ngZ4ZiosD430320CCkpaghpg4i6YOUhzD9p4NLHHXncgV9VZjhv3nq6Pjzt3+2lX8z3LYPgcYvy2Y4iaLllWFBLxSYu75Bx3YAdYasFFz4E/mogGSoKyB1rWcF485S9H4Tx696VTppbXaGTbMSckfVrtu50LOaFB3H9Ve/Zk4nN69I33PwJBexJ/dPSmQhe6YKtRiZgSWDN20MDsV1vvSrdznZFOQP594QykndrQseLr5TsSgNHMn8ZoZ0nuaTfGC1Low69vjCEE+itx/Hja73TLeqiEB/eBdcShCMfTrkulOe88++l+sKl18yQmS3MkwDR3NCAG8RAczMrRTyqDp0mSbus05nzfoZaeyvoMshmgDsWTGkMARuYFdbIsl43o1oMZeHttyoBr4cXmRmlMhchYJas+k8sI5y/IjUNgKps5ACgCjQ9FHwdjcyaa8RmWcdzy6rb8Zcx6cbfZp9fgTpLib+VO1AOtd1HlgMBHM7QrkDZx5hHJf9pmUIiHa88DRhSWNDdmGT4GLkMT73eX6Ub/N8evkGl0diXA/rPyokO6mCOxrO1cvCSMZ4sF9RuFRyWJK3pTCOBTx0/iL25Ev7hsI8DLr9HRJkoHoaIxtVbeJcQb/W6Km5wE3sMC5i1MfBdJccWrlsRYfLt0sSm+gdVF8vkCu41FhltrDiWni8/2duDLAo/fy0q6W7DEHHu0jI8M9MyHe1cRvItdjfMCFi0NOfvgQTjsrhlKSyW+W1zM0/TXjH7WWhJFl4VB4FExsfDuNoWbR3xCtBVXKNG4hHgu46UANENt/xfBYcLEwM1ay4RzDt0RXVmEA6mZpBHfI8cYotYLyFQ4HBw3AOpOWirBTbizgN6u22IWE27fBYdsPbRpRstxFa+Afja3tCNLNTXy88oz3DiwyC9RkBo+V+GE7PO4134SIdCpXp/S3R2LNBx+1CX6vkDT44sp9krkEniGZeUYiHGy8vna3WiYMDngj+Zl3d/tpm9C/PWdD8CbXvQCHvQNWLuVvEjQEu4ooT1X3qyy7OtTrp X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 307a2546-ac99-40bd-be19-08daafdfd360 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2022 01:35:08.7277 (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: DU0P250MB0916 Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/mpeg12dec: Remove always-true check 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: Gra9CTi19Yp2 mpeg12dec.c is a decoder-only file. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index df76a90c6c..56bf73df11 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1788,7 +1788,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, return ret; // Note motion_val is normally NULL unless we want to extract the MVs. - if (s->current_picture.motion_val[0] && !s->encoding) { + if (s->current_picture.motion_val[0]) { const int wrap = s->b8_stride; int xy = s->mb_x * 2 + s->mb_y * 2 * wrap; int b8_xy = 4 * (s->mb_x + s->mb_y * s->mb_stride);