From patchwork Fri May 21 09:17:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27889 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp341756iof; Fri, 21 May 2021 02:21:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJygIzgB5a+YYinuXY/Bs6141lr+jirCa0GJbmjNjUxs/8J/xw28R5YoxbY2LHEFWja2DcoC X-Received: by 2002:a05:6402:110b:: with SMTP id u11mr10415996edv.356.1621588890895; Fri, 21 May 2021 02:21:30 -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 lg23si4817896ejb.584.2021.05.21.02.21.30; Fri, 21 May 2021 02:21:30 -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=qQPiiBo+; 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 F27DC689E8A; Fri, 21 May 2021 12:18:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075076.outbound.protection.outlook.com [40.92.75.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1BCF5689E7C for ; Fri, 21 May 2021 12:18:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ejWQ5UG0rShbCk3ZKpUhcpHnwEsLW8vZNRGuNo9RnZeZ41itsoDAUMpG5SOBfyV8FF4Y5DmWYJ6TSCQBGg9Fh7DX6MR6Cc6S61pVoNUDThzXLy3Z25/groTpATUbJklP1reDfCWR2iMBQOecAcymADFBi0XGGxy1gVwIF53ckskWoyJnc0UDGN1RUKos/yRCo7j2+qybX9yDd0ndlYrVmSiAGxncmgU7eCWFAyx15JNGgAINi3CZRllJ7pxI6HgzlkJ/FVvqYSmm0M9EtJgtMHYbdd9bcn/bfsmhACK0yPhYMvumOPMbppYExHRRHr5buxUjlicBldxEggLoH50Fbg== 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=ct0d/keKDZk5zmiwKEEnoVz9HPy+Rt8LFix+hw2n2fk=; b=KYXiOQg8iWhTBj8zDcWam2vnaUtZdR1dXH6ZFGIFvsGUGI9Yoz4zp74h00Ll+dmSTKymL2Dew5zYk4m4hphILCNblQyedF6K+640ui8OSgO6WviaqU/ldGNDO4S6wMVzFKWquNe9IwuIDPzNYpgwR7Xbfbw154khlVBKgG/kxnjx++PfrWc7tud3wtvWvOHTzIpLwUAV5OVPakdYpBn14fgMyJX53TCm1+lH2gm3ZUutC1zBsgwVgqbR10moPXn8RrQi0JPKjM8tR0CT1/ZxizJgMZtXRnLQCwL/ByD9L+IbATTEzNLt/rILUpkDoRxSfKMourAE0djIv6hTR8cM0w== 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=ct0d/keKDZk5zmiwKEEnoVz9HPy+Rt8LFix+hw2n2fk=; b=qQPiiBo+QzcQHCXmT0F/CggchhcDbBXu3kiPI1Njcui8RkI/lUgqV0xDFp0N0S66RclSE2FcKZ3WtUqxiPtCXjFuWN1ahiItDaD4Ropo42uLEatu1Bkg5dGD4H+qRuZ9JJj65pHIbY4CPqMEvf8JQKolebfONFmcAA6qjJqnWn6ZfgltS7HI7fZyKGaElPUCJCPRX90n8mEcmNAAVUD7QUw23G5pYV0OF9xtsL2szHpgSOb9a+3H/vQ6EyOD96k73to18kIf0i47wVXCEgSMtit+OaACmNgOzpkidDU6Fhiki2se5f+a1N8bnXhU5Xkhy7ARTYhZ0Uzs6u1UATtidw== Received: from DB3EUR04FT030.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::50) by DB3EUR04HT043.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::319) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Fri, 21 May 2021 09:18:26 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::41) by DB3EUR04FT030.mail.protection.outlook.com (2a01:111:e400:7e0c::99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Fri, 21 May 2021 09:18:26 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:5606BC2377737804039F2D5A10BE51E8D553B42B954F5470B7091EEB1ED49E3C; UpperCasedChecksum:90D37FCEDA464C05CC598F0BA97F7D54D386DF6778B564BA407398957CEDBB5A; SizeAsReceived:7578; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb%6]) with mapi id 15.20.4150.025; Fri, 21 May 2021 09:18:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 11:17:25 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [A+PYUU/DiYV9sswj3FL2mB6uZq08LZOZ] X-ClientProxiedBy: PR0P264CA0070.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1d::34) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210521091742.184902-21-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.95.27) by PR0P264CA0070.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1d::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23 via Frontend Transport; Fri, 21 May 2021 09:18:25 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 2fcfa9a2-5de3-44c2-6418-08d91c3963df X-MS-Exchange-SLBlob-MailProps: dEG5jEBie8lPV5Pm7qExlN5LalDEj9QmR8hk3ZX8ZZOtubGZ1ze7SkstQZAfE546hqwumqP6C7aZMkbeim34GSS8L6lIFShwZlk3TBjkB7KOQnMrj5KzleSWGMjmbpN8cIGY6wWr/er/DJe6CJncbmLqshHgIKTnNC880e7fR+XrY51F/8sYF8sd75z5U3SssMJS/MO5qzWrul5LSfrGTgc14/ybGWc7BSdVmq50zAIEPL3QhLGU99yIpyJHBrtrhN5BJgD4pr5ZnQYBFwkywESR3KNxy3u8AeMaPDo36pDTVP2STbx6IM+VAzp0qbPrvDSzWgxhV9iN9srZUCgJepnc9CK71t2T1ycIrN7bQphKEqciMIVHANNOPfjEIXZeayAhotv3QvEG/fRcXFdE4jf/iUIWZdMOTNgOUWbbb9gWM9uNakI90Wpv+pi7fLOXPDURrpN06NQ5ZW3rmvHoQGzgDewsg/TZYAXBbAEH0OdfhNnTRxRe3i2BHsEEvTBjpGNILgOhP4eBjLZTsT9CYcUuvfU2vd6sl7e/JOqoRavqL1w5Eub0z7UQbfc7k8TgpYJqGNgqhfDKvjdjvPg5vfkMOgIGvjGNKKxnjr40Q80R73PD32qmoQU5mddM+G/+muC8+syCceFtk2Fue0YbtUpwsLJnZaFa10443S/I5jjzo77CsKafhQ== X-MS-TrafficTypeDiagnostic: DB3EUR04HT043: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nwRVAS/vFOshgn6Imt8MdoJkW1w775b3qdlXTejxK3nJ/BuiOR1/n1mJwWJaNMUZUyoVCxLXblLjJZxgdcxugaklLr2dYsap0fmwL3xGt3qWYdSgx5obYYffrZJ0icxTnoVIOxgXOgGCIgslE4g3AbtUeME1/7AobWeg8bVfWpvGBuxd5KYm6rB2OlJDrHudgAH95G2d5A/T1A1NhNKOnf5JW6YO1sqcRMX/5NFclSbG/jmp89t4C43+azxmSxlOzaGc+Og2pa4FnbirPSfik+o35RWp/kfB45FQ7NQi5+NKBlYtvtURkTuuKqRmbtsyYBFecXIIxaKFFm/RLx3pNfdBeTuXO+ZA3DgFxaoQYNybJXQjGR+7d8izOuewM3Fh X-MS-Exchange-AntiSpam-MessageData: ISY4HUaBQj1NoH9esR9UoIVpP5/vlNDmHXIqnQxNLgNZ9+3cE6MeCabsWEwKkuEc9HrlcXpgmMH0MRD2VmHfWsPmkSSW935dMrrP6PswqKbPoaa2PmC4LSvKsWEoqEhT5XPk7c1iiRYec35a78O/Zw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2fcfa9a2-5de3-44c2-6418-08d91c3963df X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 May 2021 09:18:26.6552 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT030.eop-eur04.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: DB3EUR04HT043 Subject: [FFmpeg-devel] [PATCH 22/39] avcodec/pngenc: 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: tLhkwLgn3XWe Signed-off-by: Andreas Rheinhardt --- libavcodec/pngenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index a398155100..5a376765cf 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -847,7 +847,7 @@ static int encode_apng(AVCodecContext *avctx, AVPacket *pkt, size_t max_packet_size; APNGFctlChunk fctl_chunk = {0}; - if (pict && avctx->codec_id == AV_CODEC_ID_APNG && s->color_type == PNG_COLOR_TYPE_PALETTE) { + if (pict && s->color_type == PNG_COLOR_TYPE_PALETTE) { uint32_t checksum = ~av_crc(av_crc_get_table(AV_CRC_32_IEEE_LE), ~0U, pict->data[1], 256 * sizeof(uint32_t)); if (avctx->frame_number == 0) {