From patchwork Thu Apr 4 19:33:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47805 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp541245pzd; Thu, 4 Apr 2024 12:33:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW3tsbiU0UhBOrbJGnyNZLkvVUZk301i6lQC9fLLfR3+U4aGJbVh6Ce9dapsy/LtdzQCtd1vsdsjyIxIJCYDZaJt3hYqo9DGuAJtQ== X-Google-Smtp-Source: AGHT+IEpU5NEMbs1URWOVivzcOKQ4eFLb7OgvxGNjQIikQv6oc0PAnaoVeM+nBV+kGctf0TMwaVt X-Received: by 2002:a05:6402:786:b0:56c:5a49:731 with SMTP id d6-20020a056402078600b0056c5a490731mr2474550edy.1.1712259216315; Thu, 04 Apr 2024 12:33:36 -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 u18-20020a50c052000000b0056df3f73ae5si2683898edd.580.2024.04.04.12.33.35; Thu, 04 Apr 2024 12:33:36 -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=TMY3w98R; 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 8172268D14C; Thu, 4 Apr 2024 22:33:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2059.outbound.protection.outlook.com [40.92.73.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0EFA168D159 for ; Thu, 4 Apr 2024 22:33:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bc5IRinF+AMA7ODs4CygGBTAwM2k6hYiSdhAYLlIE7zmIosC5XOiyhQpFMhDDWJZnn0kCJzcc1G3ngNWSn9sFx9w1X2WwbQoc2zLBKuC3Pytp092x4q1e9dskfCDziMFOyMZKOVb6P3ES1GH3HcatfGLC0x0wQL8v6Ly9y2jsZnzRO3zUBOoPSQZYbm5nFxTYnoa4YJwI7Q0RHIAYmfDEn/syLRHkq+8tgRDcG3GXHtNO4C+qms0FtZq8IG00MLCAmeDaB4MeXYg9krOqhHyaNcmL9gBWaE6KJBzkGV1gLQ0b6o5ShLfYJBxO371oocY/JZBSnj5tzbZGpsewNzRhw== 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=gbuZthbQRWUE66CdAQQ8PbfyKhYaXQ3anVb4qt35cJ8=; b=ZU026Gl1SfKyapsHlZ/0w4T82ECaFaDwxgItiiqc3oZq90/DtCPyqtOZsOuqvcBKic4MCIs0Jv0s9XoPMz1rH7CuI4fxCkYI1/3ThS9knOO4IhUqKCBQB1JE6Vx2ec+jslIeSOPq6HIbHF4qCYMefYlClfk3/vS8F9vWVrN1Y1q+RuntTDEyYriVhR/Om5aAG7dJRKe5SDNdL7xIHlzzJYyJLMqzAHyy7j30pPSgBdNVoAZKffkWUOfEN5ZETxU5X6j4tSJJ+RnLoTULkvcPp02fFFPzGivwbTz0KvYoEvRCCAAvIV55AaqKgJQg2Y8Xmuiy0/VS2vLrjasONYnkvg== 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=gbuZthbQRWUE66CdAQQ8PbfyKhYaXQ3anVb4qt35cJ8=; b=TMY3w98Rd+t5JAjbSQ7rqErplIjAN0aOBTzWSPi7w3w0WKYgKpqmhN7zsOY5mgGJzMmIpsTKQmF8xTMhZZqTfZ9vDlkIa5ZxwDmcEzFDTH9g5DCEF3QhBShVupmEqzfO5Oz//N8ngmQAonAgSbTsW2QhE0RG7rjg5TAKllP8xEHVeuzkZJ6OECs/Arl0zqAEOEbz8F4bunt4c4CcQQmauMUZbK3B9sQ72acbF19i8zBOXK/n554kVllRieofMRCAIH7O0OFUe+yL9wPBJ5tPWopi2P6zXHLvlE7r7VFWttfeqrWBPGq4IbZSI5VjSq1IncC6we8/oc2Xow9I9xhiBA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0148.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:275::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Thu, 4 Apr 2024 19:33:17 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Thu, 4 Apr 2024 19:33:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Apr 2024 21:33:09 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [XliQaOpNGMITuZwYQR2kEUNUEvohExlzzwjUcqVQfUc=] X-ClientProxiedBy: FR0P281CA0181.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240404193309.3969296-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0148:EE_ X-MS-Office365-Filtering-Correlation-Id: 012f5176-1622-4de9-f13f-08dc54de140d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RdXB8pu7GCcxwA5ygUMGz4CyfnOMRER+t4xqEKGLSoQaYsR8bSJY9R7/zTJKYRhd+UhM/bmbt8E1ku0O+gZtUxh7p8UOg5uEuh0QXwt4KhGmkWEpsIv4jlwVkYQyo52FrLkdy5fpX7vhRM/pStMUZmoc4R2mMsMqkg/06R7SfpDwYfyZAY8lvtI80RDyfXbAqHXEPWIKsIisGqgaPyWUhVDftXYItW1F0sFURvBCCa/EwoK1bVCcwMdnxD0ZTRAZKMY5dubnd7TFcuJNCEurgwgh2d0pP6/kz79Wb2oz0tH8zdS4cIww/Z+CDwq0a17nNaJxlN2ro26BkgjV7hjz6FjsIgMm4st35r/64zkhLjGc8jdEyaRmWE1fMETA1BYNQnd7egV+yTV1y+iD5ZaoWRtY8NgCYPpfjKrhgbUxqkvQXZwxIv9b2Bixv9HyLTM4FTTkK9bWTxrX3VUjx2sDxcriF8cG6dlkZ3vZ+sGNkmLEs7pFHEYPMXc16S8XgtcGiw1ve5DvV3DTnrodCYy5Vh9a/eM1dJxlSxeZ5E+S601M/bc8Wc3OQdzyzvDAxBjcpzRE0Orlergg6pxxm3G6TVkZeMXDi1zhVJHwJ4QzCSRMlYvsnx6g/hYOJzC1Q87m X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FaMZDomS+t7opS4bZTQAFbasZzQ/cqvlP9B5zlNSgGh+oUmkUCbfHJ43EYvaZfudx+7E7TxA/tuqpxc5//ZC5Hwi1Qeqas+2jMlwlUytBLPR/nl6woPeJBvZEmBZcGIGCfjtE5/5r//nnMncKAWb/rvpnJ3oBPEk7Q6ELpFbX2Yl/a3LfQvZ3qpLaPF31bexqN19QeJRjHfabkrsn+faLRGFRNife5UupgSiBzfHZEJG+exX8Xn5jtLlnN/Ie4nr3+Vrd8sMmZdJ7NJ+wWZAtR7Fx2ylaqG7rIG0s4bLqu0alU7zxduZt9bzxV25NXz6B9hG/mXG+Rc/crWoEJ1If+Sb4cTCK719u1ZgXZwSAACqt09mVBCp2pca+GhHdpRGFuVum95TUZqWRG9EXFzv3WqAQcHkXhsNbQNh+3i2hphS41KIqdaSWYx55JSSn6GaYoE8sHQQYPeAFfe9gjFCvqF81wdnJpUD3MSaa2ULNI3DmxhZkk56VcDj10t8FOWoFv6m74IPwAnNizmgCdOVp8Ko8ohW9Fh3GpuVEwBUFe1OYayhK22X7GX+aDsKZV2hZuzS4Fil+bYSVj2+bGnnvI3s3DeCMQQPgsysCY646L+H5kydGID/3QBm7gTiApbo2+rE0Tuw1I3qbLfqnGHnB9t/5MI3JnNzBfdq6db0fhwyzkkecqKt6a3arR0xsXD1Wpdsfd/NawoVhAt1G734dQFuoAKRNQvi2RJI0KAHe9Cd4BJ9heOzsNDbZl5jEIBlcAC6oFGg1Cbd5wBR09Zh8vjxZq708SkEBmS2VhnamPgOnstLQ77koxjbF0cCV4StG+iCLMLM/DV4KolXW0H0u6z4zPp9ZLUE9uG6+iaU7LAf8HgVqvdlF6keSmb+wOwIhUWrfNr0z/8hMBMEAjVOLvXegndQfeH8iZxBxI0XBlPjkUT5RwbakR/zJQV+F1FmHWibGMsIJfYO611JFQx+NmH0S5CPqIzzo5f7jWWasJC74AApaYuxuHkzO83l0R8q1ihRmvumZxqUPbSMvv6UF8lr8TDlGbNwOB7UayY3A6QC7PX+11ylGXYrZz/zrQbxzfgLIGPhpZoK+tDTe/5GXKLf4EiyvsQjSCC1S43tZ3YboIJBZl4LyWKM4Z+IHV1Es//LVOCMGPltQ6DhHn6ggCET6IUx7rCEsqQfznjxnMeD6DeW0ss2ZM8woiOxOJce1Ig2QzU8JwbcVUQsF5fw6PiiU+DIpP2QWN2fPgCPEVSgWKvSaENRhsjJ0Jne/c+ErU6wQzzTHwIJgMxSBNT9Rg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 012f5176-1622-4de9-f13f-08dc54de140d X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2024 19:33:17.8364 (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: DU2P250MB0148 Subject: [FFmpeg-devel] [PATCH v2 9/9] avcodec/huffyuvdec: Use assert to check for things that can't fail 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: AFV5Bnf7CRJJ Signed-off-by: Andreas Rheinhardt --- libavcodec/huffyuvdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index e35d55c8ad..a8ccb724f5 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -290,13 +290,13 @@ static int read_old_huffman_tables(HYuvDecContext *s) bytestream2_init(&gb, classic_shift_luma, sizeof(classic_shift_luma)); - if ((ret = read_len_table(s->len[0], &gb, 256)) < 0) - return ret; + ret = read_len_table(s->len[0], &gb, 256); + av_assert1(ret >= 0); bytestream2_init(&gb, classic_shift_chroma, sizeof(classic_shift_chroma)); - if ((ret = read_len_table(s->len[1], &gb, 256)) < 0) - return ret; + ret = read_len_table(s->len[1], &gb, 256); + av_assert1(ret >= 0); for (i = 0; i < 256; i++) s->bits[0][i] = classic_add_luma[i];