From patchwork Wed Dec 22 03:30:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32831 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp6024671iog; Tue, 21 Dec 2021 19:30:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJypwoEOfnxfbsmZ9Bf6yLDcQ64UpZGbq7ojPDR+iskGnYbg6S+mgvyOVo2eHzWV/1s5SvqF X-Received: by 2002:a17:907:7e9e:: with SMTP id qb30mr927865ejc.348.1640143830904; Tue, 21 Dec 2021 19:30: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 u6si332124eje.277.2021.12.21.19.30.30; Tue, 21 Dec 2021 19:30: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=UZJ0Rq45; 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 1198A68B000; Wed, 22 Dec 2021 05:30:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068044.outbound.protection.outlook.com [40.92.68.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C329768AFE2 for ; Wed, 22 Dec 2021 05:30:17 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OvVCM5OyA3AX6Z/1Azhdt0LQgHc1yt4HJrbD6X4/DxzK0J/lVBTB0ORDdzIVJVgBuOzqnm9c8YGAMN7gH7bGXBnaVAhMEmPuaV1DVoEIHcw5lkm5FgyUVuVrQ0lawGMKzr2AtcWh4uxwp8PpBXFbDXAuvE+df5uAL4zWZVVBQ1TWe53QRjPB41kN7wbBNQ8a8xJrwpsIFRAOsBbjLcMsRJUl7vxklZ7H2f1KqKk4cPawAinBAyR+2Mar4PsyoZxmeQ7FPSSi0Y9LyOY/0OWA2os8lZf/GJCtaOloSbv5/8CMwQEa/W63zDHZpMo97teHmu6ag2hVDmz+RKinuLYHlg== 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=pRZfFl51OYTmNc+HKAPMI6M8s6GDi1/7iXb5z7pmg34=; b=bHyf0/FS7xa++I8Mz2kga/saoMNS8sWRiAirbw/Btu2q4tllpyZrGLKrHWBabi15Mp8/OpQPVPcm4iN38YKD0WR2LZWKrlETwf0mCerwMsLzPkZWsOTrn1PJLWW2wisoqBomY6OkiYjtf+vK+yg6YdUcClm15QtIhcD7oU2S7HAa6oQOWJKP/UoMlqdSimpL4ezLB84T9a3NL7gmnMOzkFDPuQ0np2uPaKIuh38O/CotcA6v8tGsoBMWf2qcN1oZmFOSOIS3HbmK6vOLofwV6R9Xp3/kTA0w+/oCgrxaK5bH+00U25HdS/c467G7POXMYtsDvIJ4RwWzPPklSHLqlg== 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=pRZfFl51OYTmNc+HKAPMI6M8s6GDi1/7iXb5z7pmg34=; b=UZJ0Rq45sjhpqFgrtWmu3m3JP1HN6KTJP70R7nc/LYN8nkb6jeMSQmeycfr+wagKyNGIPLQB5KQnE4UIblj+fCkrhRtn+CvORvcrmAaOFThnVoPryyonI4XWCnEXYSvhciMLm9SLwXGKXv/yR/MZiNrfYhmpi8JMy3WKqWNdNjhmLaYoyP+eWizqLx/PVsFwwpvHRWYEzfOVSnSjytVwaUjPdfaGXlEXgzb58DKK5TR9kwG/BO7zG33odIyOOghs8ixdv4CiKmQG8AXOGCxWx0qWLDGNWXlY+Ad64qdcdPhmEeHehsx8nk8I1EA8CflvyaIqhrLnW6jTrDLUvW7nzw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7159.eurprd03.prod.outlook.com (2603:10a6:20b:2ea::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.18; Wed, 22 Dec 2021 03:30: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%6]) with mapi id 15.20.4801.022; Wed, 22 Dec 2021 03:30:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Dec 2021 04:30:03 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [bJbKiDF9Wb6ZLBaQ61c3jA6jceSy2lb4] X-ClientProxiedBy: AM0PR06CA0085.eurprd06.prod.outlook.com (2603:10a6:208:fa::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211222033003.898353-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7656b248-e865-489d-bc90-08d9c4fb5cfd X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhllSvyGA38X/FtZJVNczApH+zkR+g4S4+gCoQ9Gu/btvRMmqKiCKOsEwaa6Ku2thdRnGPIpgNSoFRF6cbM1lD/AxAVwri4/7OoAYoLvRHwTPzdP/0uDxoDNn0DnDYjICU68cDh+NThUEfLqI/wDrGKCA+SG0vPR1U5Ql8dRoaOUfrJcDN0UWyqVpLybfYEXO3CzPVHDEga/7I9P/rfIZCM33C9FIA7mFfgO3nubJv2LmL5/g2fBTUe533fEP8d5ib/FcSwz8ez1ylPMNQa5OOAO3x2wj7e1AQo5+NPQ/UGhjKGjRsm5auRQS3t3m0Gmm1h25mNhINULfBeMUR3fOoz+GIlf1HJcrPPTg5cYPeJwnpn0IayUA0j4f29TNjI90fv9UYY6/l4miNQ05oqqeI7F/t/dne4Lk3qIzrCvV1fz7uOBzwcTpjf5pCJzUEcoWB7yjFf7D6jyBGOf40rm+ylseRkTNSjYCJKlmMxrJRwd5NoioP9I3HXHN8gTaLgpFuuwchPsY8JZ5OsPUHubaFX4+C+uGA82yX9wU9bGvZMwYkqPPItqTVgG7QHbPff1oq2TiKWOFFspiwyGC3rBVPJuPiZcP4AdAl/vwPMxwkWGWGaP/aGX+rMcXQqLGR36rKHBEsw5qYsqFfgmqtOCLY2LFwgdh5eXi7B+LGdMOgCvXIF08bRLwDoUjmflVPCax0TxMUz4GMWwbY= X-MS-TrafficTypeDiagnostic: AS8PR03MB7159:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JnLBeXmd/HmEzzer3vSfS7gj9m/Ck3KwXW/5wF+ZvxjO0nGJbcujDCdpYXPgOChfpJeo5CRX1fjllOytWHFGyTSIJi6QW1h3ln3qY2fq52Brms4NPLIWvigQFpwIoPy+HeLRHJDgBluFW2rNySs25oNxLAPl1M9IvzIaaquLIhyQ1+YwOT2dezMbDyRR142zN8Evnp6PAIZd/kkpbgajp3GMCXOcr7rfzDjE0uaKZxs9yMmQV6v/f3EPI9LRfhfj2uMmVe6So+zUwyVepdo2mCTKMN/9BNNnylrSlMMLA7+gNevq1Jb2QSUuGwfjzd5uUTo1uOB3/N+hVzGum9rUB9gtbqdHOqiUZFP60gMtnA0QeQBPMxN4V5IIUj1BgtXljNnEP/tAut2vTjnPXGidOlA9WLGT1mI3ZDACPkC6+zGRJr3Efpnn4sGQTed76VQrdoRLve+xTm+nMO0ID3is5Ek1rS7XOsLGigLP2bukrE7xf9C8Ipp/8Tq6zH7VDjD6y/1P5LEXPsFtBDzsXv3gF8cBJPxgK147pyOpXjGRlyyk9Tp61RcQ75FtyvKOcEpuWDQ1myZjoQNWBatGe5qpWw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TK3WnKn+Ig16GeFLEWmXDROwCZxGErN9OQIWVQ0+eL/6gZT2y2TeGerA15RJcPzV7Zcp/l35fqjbPdHeXfGrwopOwanmhxgh9c5jTCqQCP6SeO+rbwhCll4lUwiJusQuY+A2+/kngNLXzQzAJeVfHPhUxg/X8ccMd4O8XDWji0mmUh5UT63ACuMjtSDv7vR22rpzxNFXV3mygAPHRpKVfOcsXeDi7InyxmBHOV+q0tUrLYjFlGc5C16EtcYxz9jdnqmJ3EOImQsH7fD3pKRc0vACp3f4Gu2D6QeP+TW+yBLtXtcN4j5VmI7Ygy8vwAVMqfmVZ867aLwitI8Sjw+J55VsOjw+v/8s/+voYcwwOQrydVFnSYRkWx0ZeyUf+gmL5XQcCI/QPT1LUsizUXCo4SgsjzZZCe+ZIYWY91f4mL8B82cO9Qc+ElKVhVYYgOLokb1IwQLQ6bsh5Jhj03AnMSnGh7T6E7gcIy+8ndiPA1Sy3OgUe/tcZ8XhtAAAKOvgSHx2Du3pSAlCzRXg7DoD12x9AmGYK+SQrbbYElC4Enw1hx/eWRa5YDwjzir0PBqoNf2w3qiDqz/IFmPFJnTHKt4RtXKA4tF4Z79fc3awduegH5QsrfqTmpj+SJZoJk/qfbTjHvLh4UxTSZbqKGW7AbhXE/BX6kBM5RaPJhI0jJMaILKftAZjtuw/22YpxLLKjOki8IlouGJsRCN6f76MT3HofutCxEcc1u0zklhLgu021oIFDd0Aj7z4ZfZhhz3SmhltkjoloTPx5mymRiMP9/QcmlmU6PrHQ/HXzXtJWtmqk6JqyJfnwdD6LrEgE6WpeVmHFa+cdoF7f/sPpjY+C3t3bJtKDyCj7pepsjZcFk+KIjWizqFmmfMjxDo5UK7/sDPFRwWDmIO3lf/o+O2v680MsutF85q4+Sxe5QdpcsGGCJvw9074FSWcFTy3GpjyZQpUjuYQQVA6bpvq9Uv12g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7656b248-e865-489d-bc90-08d9c4fb5cfd X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Dec 2021 03:30:12.7478 (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: AS8PR03MB7159 Subject: [FFmpeg-devel] [PATCH 14/14] avcodec/mpegvideo_enc: Remove impossible 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: ktHqOQjqzo1A Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 4ee7666c78..79f67ca01b 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3596,9 +3596,7 @@ static int encode_picture(MpegEncContext *s, int picture_number) s->p_field_mv_table[i][j], s->f_code, CANDIDATE_MB_TYPE_INTER_I, !!s->intra_penalty); } } - } - - if(s->pict_type==AV_PICTURE_TYPE_B){ + } else if (s->pict_type == AV_PICTURE_TYPE_B) { int a, b; a = ff_get_best_fcode(s, s->b_forw_mv_table, CANDIDATE_MB_TYPE_FORWARD);