From patchwork Sun Oct 2 00:06:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38501 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp527279pzh; Sat, 1 Oct 2022 17:07:08 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5ogC+c/81xWm6d3C/u8hWO7qV82KyRimEtagnCqgneAJGKaNzquN0A0kxSie8L1F7x5lJd X-Received: by 2002:a05:6402:c4d:b0:457:99ec:1837 with SMTP id cs13-20020a0564020c4d00b0045799ec1837mr13124510edb.86.1664669228728; Sat, 01 Oct 2022 17:07:08 -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 o12-20020a50c90c000000b004584e4d62c3si4586492edh.187.2022.10.01.17.07.08; Sat, 01 Oct 2022 17:07:08 -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=kEhLCb98; 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 86E7068BB4E; Sun, 2 Oct 2022 03:07:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2061.outbound.protection.outlook.com [40.92.89.61]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CBC068BAB7 for ; Sun, 2 Oct 2022 03:06:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YAfVil+fvIXtYRD04VlyTFXuURvO1OT6n8sP1WslX3QYVK18xgZNAc1eyZADvUPz9Ssr6ZuYSGK79F4d6l9iRZ3SZ/R/2zYdxojtZ/HbiOutoILrpAf37IYWM4LDskFrt0CwIMM5Tu0oQrdAXdsQ2FzZo6y4O/8FyPEymFTIean+nLcqYl5gLWEEnwoiKyWa3CaBQzSCPyaEA599JN+83G2NrJHDf5fVLKK82TsT4H4Ku//NY+0fw90WvoG+6EXK77P6qSaPPSW9Uibg23xCAoLRkpCh+rkinZX3UKZnzNJmDF9Wd0GjszK8GS0bRAlvfB7x9KOvOh3xva0dzHOj5A== 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=y1H41RduvsnC8EBpJY91tfrDmzhSndfxuTTd4hV2a2Y=; b=iUd/Be6+qSD0EV80QozlV9rq8U5Oxys+nd/IJqGodcJC6C1RJyMRUvY4tUTccZZneuYH88J5qaagaOvwaxYVegTzVr9P0Y02tOZRRtIUdeofKu7EXCqh8KkOhpW6NY2zmaaTP+DJcU+lr2SeAhzMPNeTqPwJP3CbuNbZajl7W36J6+8Zxa7aTTt9jn61s3mKFzj0+XD4lASGpg33RthQuehjKLVYf0jupUbPzmKbPOodvrGEq6vpGfbPt4u6Y6mW8fLa7bcBDWDtnmT1qQcEuyCj3PUgc4hE9nNuPCCuUzlOFA21nX/bgVXtecoS71UxhxfA0n8yDLqVAU1ZEj5Qlg== 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=y1H41RduvsnC8EBpJY91tfrDmzhSndfxuTTd4hV2a2Y=; b=kEhLCb98A8XVG5DR+MBlM7yJnBbokez7dK4txDyYB9XMGU8FHiwNKGP9myIqqf9i18j907rdHK5oF1DcT58+mKY5c1CMGGjfs6nHgneFQauwb2XxIx+srDERscs23a4LVfXFPBTXDphB8tWaPHC0guKNWqJnwSt7wxFN2YrYT0sMhSNB+ajrsfsGzFR1z1NuChp4YfQoE8wem8OSL3D0yvKwF1ofSNT/47kqsCvujfu9quJ9wYbdsVLe0lZ491kuDwCX8B02bAk6e94OKAS9uMqwbi1M/5oQtoHIk51oR67KgxIKrFZTdmfdjcydrvWWrrzId5KnRqzC/VdZI8S2Wg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by GV2P250MB0997.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:d7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.23; Sun, 2 Oct 2022 00:06:52 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5676.023; Sun, 2 Oct 2022 00:06:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Oct 2022 02:06:07 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [rbE4cPe67DrnNBza1f3bJdcOHI7u7Qz+] X-ClientProxiedBy: ZR2P278CA0010.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221002000617.469194-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|GV2P250MB0997:EE_ X-MS-Office365-Filtering-Correlation-Id: 749ad57b-6f5c-41e3-9ba2-08daa40a029b X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqRS+LhpAttTUY7UGhdHTSoEyrnz/t78IJiEdZeG20GIDVwp2c5Nz4i0Rl75FXOESmjjX5HrTt8nzlRZUHV4x4zdhyg+zwnE0PsmknCzwRJ0bRJhm3QJtBAPVrlt91LDksNxDj/FQA7Xydz2YG2tK41tEaSlOSbexHpPLtWllhnaJM58Doe5MLUPnq6k+zyzbFfB9xDMgA0Gv6LXnfz6QsLKNvhe0oaDvdD19mH4X8hTB0frRAXYbP5b3aaSmLdvjH/eLor3ddb4LkRNxGIJYFaqvUrSS57CdehkV61XVTRMbuHA61YGSUVS8so/4GnxjL4IoPoMSi+pBEa6uRdJzlgtwTxsWB5TYumktS6tz1zLwYHxqZOQrTZtMBw+wYCdGNrCrzGYnE3hrqhQgf7cCaXX4IjZz7iWJ+VnRqSszso9ecUu+SJePXIUY34esGLQmvS4CCjoAU6ezsL7bqk/RnPX6kjlfbtRgXvgMQf5VlPJyfy5bBvAyoUSjbPSZvps6WA9ikFKRwliwh1TVOVWYa1hPWOAcl0yAOU3kHE0cALCIdXX+ljVF5kYilnQZxd0+/xbOF7RdjcwMnOaR1/EFC7zu/2VVC5RMd7SSHlf33LkgLRkqatQo9Z/AXg+uxnLtv2LWCW0ISDFIY8UZwSkg8k9AQSOo8Fn3fLtLwVYXRZdEPkkKEKMawXWsv9QIZpIFm7MpW8CbrPUydqOPuYJBukM6awohq4fPXX8kLa1VkIM7q+kaAlX1Ul4MpAtKsr8Vw= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PuipB3mA7dc1vEh3uw1Jdm1zzvGTw30csyDdxFunYpJ93xq5Lo/6uLWOPIcgVtXUrGVQSQVkFEZ5dvd3h6cNQAitnD+cpO3mCzxe+ixDAPXBVyfKspwlmDyet9eyqECvWoScB3jLdRZcBDXJkaFq825OTKGQjKorjrcwUcsSzF1UKq9x2X8DATHiDEWWe19XbYf8uixNAv8jSMVRMClFLKxnoPsSFi3nS/V7Wt8kKe6vdH5552RDO1wUReu1tcInvzNV7sfGokwJmrQzwfTPm65tTbbbCaalt6LqonYdS+3g5CnG4k4XOQECq42z0Djss5pTUu3q0Seo9Le3WNlQNmZl6gdMBh0Enu1K9l1A/qxNHI2pkc/K+thgm3dRkVjVLDhO2C1yZGCely+z3yRmQBDMZwuMUQi4+e73OxRvHIJwn2ak/DyFV04iCVv1tTIJtZd9/BZQlfCuu1KQyQmjgaX+zR2G0FbHM9WWNutpL9xgKY4E0HR4faow/hAYdwtf8TO06UFNvzUmiqfJA+aCcs4t+J9U2GdcLlxsDpCMhn6OpnHUa5IXc1v55pkI9mcf56aehpKr2t7AJxz2BBkxdHiEjfA9QfCli6RJC8q5f09MD88POKMDbDuZw+7DS2McHv2XOBdL2hJXpYoFDufyVaPUhH/2mdfsnA0BgbisHOSwosZKuix+2NVRE+bsRA3h X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wp9MtIHETYLRVFf/1Zln5E9JdrSpJMcy0bYdSjxM5XE5D1zt8+4wEsbt7jn5C0s818jFi2UOl+W86UdOlr9AgGnIq5wWNvL91vS7+3SEy2aTx7OtOZCOby1O2v908EkigaDyvqYQXs8ZGjUdjp0wDYQ4yB529F6EwstUlrwDPVLBXDc5FuR9CdeFeaNpmwRP7MqTJYJ9Q7M2H7qZxuuAsJw63fxm8jmPJv9VeT04KjoICPfPzL+d2CjP+BEDp6lRVU+7kfNzPugEla4GwU4tRXyerbf8FJjQp5/YcVTg1FQk7V3VO4yC2VEfYvJCnxDGsveTAVpSN2BsUxoxmLjG5lwee1WXpXC7I9GbOibLWCtdFX1tdwe7kcq/j41GaQsjfk0tRolS6jD/Jck8N6VXqUIoeoQDLXvprOPLGW4Z3fdwJ/XPC0sgTL/OGEPaBOIbhP5rOamgJ5i21iat1L75LFvQnlHbKzh3QJp5SiZP9JOvZY8DqLfI7ZwqqSvBFAbMHNsbt4mlS4dT8XKU0nG5OhQn13oprsnlDGLvFLBXfKQKlGrNouiz1YuLzkkQQiri6+sYxiYn1fsptPh47thqWiZ+3+Pud7mL3j9O8b3aULq+9HowKY0PBrCIu2dkeyZ56pYUAFZ6xYSGDMgzGAV0RJIvk4TKph2DLyoOR19nZa869vdFgQWZMFNlX754Kf8sTyb0Ph4/n6qnTF1ggiqZ31W70/dOP7qmhB36cXrL+y5FI4iMKorzxC0Hn2PkDROOvZXMqyGyRFG8bh+7J/FWUIYr6TW2WC3+MSoFBexO+7+pPAo59ueqjl474ikUlAN4wga/4o1N3DCggbL8NFqYUbzQoioW3E8jY7TO56v6wB/Z/5K+NDXZw1tifSduguZO47cMnJM8wWAc2zZeoGicZT3HeWTY0gZWsEwP7/gpxrVTPgrkBN0yM8pzJC238mD9dofqi2YWSugbokeLWMLRWUEPphx/a7MC4ruN5jUk2oYHA/2iEKJ4xX+JGlzSE6spkbhgRYt0d048HLrNpFH/B+EPp6l5rjA5PfwtIuJPnQR/h2lQafone4kT2BNaLjaMfV6lrktIMPOOAcRQuR8Xb5Xx9aAFO7zBR2dAdO7cNzeejDth4g9pf4BEfF9r71iyepMQ1U/hcf9jGcsMqNA5LlnMRLyHG7PsBrAXS2jtAdZCk/zeUZ4AEPSA9ioDEyIzXejz0xdMYexLXkoNuksTzylKzxvgi3dbWubeAFx0Xq4IHF2H+9R8X3Ll4cXlQkra9BNBMcjU6lITTMJGlxzZAKLV8PO5ZQeqeU5pLGQN0AV0biQFDgeqdQeiMwIUcIoC X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 749ad57b-6f5c-41e3-9ba2-08daa40a029b X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2022 00:06:52.9070 (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: GV2P250MB0997 Subject: [FFmpeg-devel] [PATCH 04/14] avcodec/huffyuvenc: Remove always-false 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: k9rxvHLgogxz The ffvhuff encoder has AVCodec.pix_fmts set and therefore encode_preinit_video() checks that the used pixel format is permissible. Signed-off-by: Andreas Rheinhardt --- libavcodec/huffyuvenc.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index fa4923962f..80dcdbaa93 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -310,12 +310,6 @@ static av_cold int encode_init(AVCodecContext *avctx) } if (avctx->codec->id == AV_CODEC_ID_HUFFYUV) { - if (avctx->pix_fmt == AV_PIX_FMT_YUV420P) { - av_log(avctx, AV_LOG_ERROR, - "Error: YV12 is not supported by huffyuv; use " - "vcodec=ffvhuff or format=422p\n"); - return AVERROR(EINVAL); - } if (s->interlaced != ( s->height > 288 )) av_log(avctx, AV_LOG_INFO, "using huffyuv 2.2.0 or newer interlacing flag\n");