From patchwork Tue Apr 6 21:55:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26782 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 94C8744AF20 for ; Wed, 7 Apr 2021 00:55:56 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 791BF68A6F2; Wed, 7 Apr 2021 00:55:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069096.outbound.protection.outlook.com [40.92.69.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C696D68A5CC for ; Wed, 7 Apr 2021 00:55:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K5VaQAds2X3JPiRyJLx3PXOWHVOZobci+WBREj8ZLvmEswCQfNzzMp8VEJcSmQbIvMGYuCPemfheQXlOG/GpWFue6P7Vi6R6Eco9tubYKGMlg5b4233Ae95shJMr8ZifTBORAiSs15D7URRYXfzaBqRI7Br8wf0hZpNuRSd9z+jrSHmuoa55dfSlnY8sNKAJqSxL2AQqBZOEfFXEyP51U1nysf6GXnHH5AWQVXJx9KO8B/+TzX7kxVf0TXX01j+IqNkx060c0n/8EUHdVAyzN8xk/xwlDEQEte8MIdW+7MR1AxyokoFBu8YBTMGQit1aO67cxfN+SY6012wTQlOOEQ== 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-SenderADCheck; bh=JciFSE4pO4BRljp0u5CHdU5JxWb6oSYhefcxKmEP4NE=; b=cojCrXlj21xbCmHn4l9kM5WDz6fXthC7KqfROAwdjBpvF+VDWBRDoDPtIwJJJ2ok62gGFimdQKz/WC3bngBCe56w2UtI6DhinEgoalPM5logY2Ixh+qF075uy4U6D79rL51OSnjXnqyneNhDVrrunsPgQm8XWBX60ROB9c0RkE3vsapmEua/cz9Kcm1r9bJNCVlMzVpVXFpBgbuWY8Ik1p50J2wEDnk/3k6fjGj+9FdWgZYQtrTY7W4L/7gUti7BiUwrUOInbrDqHm4NkPz9Za3BInDQ9U6nIkSW4bjKdxT1+Eo4kaR2uUgSJ9Wge/Ci/2oYPcEcMBxDBF4LOubUOg== 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=JciFSE4pO4BRljp0u5CHdU5JxWb6oSYhefcxKmEP4NE=; b=IueGaf1m/YwPl5Q6F4XIM7b2t+g0z/EMdm7UL9kfYTWg59fXXrlVk0E3DmxyXUTBwK11GqAKGJ1kyjERXJlE89C87XmlWuG9UMgh7EOIrqUlCmiWBThLnWNZPB8aL2zUeXxeQC320DDfKm4hYcNvbMlRcKMelvW/RErIN7ob7Cf84uTIQXmPRPzOgdaKUFUwzBqUL34iQaU0qv7S85ZZaT8ueihx8P71eS+FVA4DUR7Cl8g+d7/UYWfzBklBOwMx2Gk8bfU8nQTbPKDFjOU32ySIvp43pjC25kcHbU2MbD+HbcyoSK9iPnpF4TfssPKPDw9Qla2PUHjWtNYHpL2Rpw== Received: from AM5EUR02FT037.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1c::43) by AM5EUR02HT189.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1c::391) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28; Tue, 6 Apr 2021 21:55:47 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1c::46) by AM5EUR02FT037.mail.protection.outlook.com (2a01:111:e400:7e1c::182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Tue, 6 Apr 2021 21:55:46 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:662383FA05009271085AA2A177275AC5366DD282012C2F015680DC8A0FFDCE0D; UpperCasedChecksum:08E44C6FCD8031DA06732CF4E91334008536C8A8C28E4671CDAFBBD7C25A859F; SizeAsReceived:7574; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3999.032; Tue, 6 Apr 2021 21:55:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Apr 2021 23:55:11 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [0BVMY3BvgVC+XCWivVrN1dXcAX3yFJPz] X-ClientProxiedBy: ZR0P278CA0046.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::15) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210406215516.832944-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by ZR0P278CA0046.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.16 via Frontend Transport; Tue, 6 Apr 2021 21:55:46 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: cb498366-d27a-4bd2-e72c-08d8f946bbd5 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRct5ooVDkA416xUUNF5iBFvZbGMhZ46rY5DSbafWWaIfjX30Tj4KeUeFB8IApmU67NfDpso7AgASerupkd1EgAY70gE1e1DI9CnwMv/F1QJ52j4btEQubxC4mphOTQdJaFSnP+cJJt8hhepFCuKXB0N2EpxlGfhzSVxuEzpyyhBshJ7yvZQNZDzmYBlop/NO8SGLkxaCkh/R3TwwsA7oWk4T03Hna/Qf65Ycbj2pVuZ0k7OsZm670Q5cNDbTtook63Rowbcn77s9MS8jJ1awC9ErggradVrtA6j0u2/FhKMVinIfi+wtNYSdHhl64VAVx5195EmG1VyzFKG6IgWaw0JbTMOoBgMzP/jh53FgLVg1nwns6jaP3u1C+uOqUrG+w4q2AIjPHmZJ/t2qiIeEklKeRbN/lz2uxSwRTWyCAuQAQB6wmrEKkOINT/Tv9ODD/ogQNkwTYeXJmNav3wVl9TjSrSoNDDWT0TG4L6uiXu8r2aMdDcYYyuqt5Wt83JsOBtUVjU5UCN8Bg5gD7MPbrTMMXwjADY6kLcRJ3ocUjvZGXsosbaGFarP7cuUTp1da77eG/YpRHknLjv8z/rWmFXhdLYGQs/57QYJVLMsmrWYvguZa8QRjRYLMDUGDE04b5gtD+/DWwYm0TrVnbp9wTbpfU4e090hzQC2+ePyyZuBmRknOsYQ+0RJNNQlw2kkcBJntGjB/ANSeYz3K7dJFMgUGigbq5kv5JPHojE1foHZ59t8gqVAtsD29vt2esRW4g= X-MS-TrafficTypeDiagnostic: AM5EUR02HT189: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A4jWUTpEBkaYdn9Jrha7yd5MvrlepxJgsnysxl7qFfPgts2phAuHMQZgo1qrc38LzZY3/HHvfX6J4HLh3dYzJ5rIfyCoVDKI8o+XbwgXbKJ+mgv6qOs/YwikwSf98P9QDRz+RGUAC58bK2g2qq1CtRM8tHL6NAdYKXMFRxa4WeOIDAKm3ukLlXNMZEZzwJwDdHf6szeEG0l0U+Cft5mXHukaA1/f95strx92mTTeQyAjrMZK4UnEVnpYB5XhY2QqAz6ThfnGCjrLGrf/9lkon9KAG1SPPrTcfZcwzRAlLSDiAfu/GUXgaK5c3LzqlhWJosU1FyztwGgJ3MhNnHxEmzPVCADNJ7cwVEUx6WNMyKoqjLcWE/XY/YwdrAKtOaJSI1oBQKubN6vfPGVfHR094g== X-MS-Exchange-AntiSpam-MessageData: BJtn0ZiuOgp3+7+CsrJ2zG8ek4jgnrD1eZHDy3MXSvQF/Yq6tVXg6fyff+zUeGt9U0NPuGcEIKP8YGSeaEuhZzHb2bIzNeIjtdGaDIEj0IVlUYnTJFbZeS/BUTCV6f3N+PLZcK8xAv6eZJk5RJDfzw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb498366-d27a-4bd2-e72c-08d8f946bbd5 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2021 21:55:46.9528 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: AM5EUR02FT037.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5EUR02HT189 Subject: [FFmpeg-devel] [PATCH 14/19] avcodec/mpegvideo_enc: Combine identical checks X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 0a1d0db86d..e5411f0393 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -527,10 +527,11 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR(EINVAL); } if ((s->codec_id == AV_CODEC_ID_H263 || - s->codec_id == AV_CODEC_ID_H263P) && + s->codec_id == AV_CODEC_ID_H263P || + s->codec_id == AV_CODEC_ID_RV20) && ((avctx->width &3) || (avctx->height&3) )) { - av_log(avctx, AV_LOG_ERROR, "w/h must be a multiple of 4\n"); + av_log(avctx, AV_LOG_ERROR, "width and height must be a multiple of 4\n"); return AVERROR(EINVAL); } @@ -541,13 +542,6 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR(EINVAL); } - if (s->codec_id == AV_CODEC_ID_RV20 && - (avctx->width &3 || - avctx->height&3 )) { - av_log(avctx, AV_LOG_ERROR, "width and height must be a multiple of 4\n"); - return AVERROR(EINVAL); - } - if ((s->codec_id == AV_CODEC_ID_WMV1 || s->codec_id == AV_CODEC_ID_WMV2) && avctx->width & 1) {