From patchwork Fri Nov 26 19:23:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31754 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp2668870iob; Fri, 26 Nov 2021 11:24:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJxHXofMsOMx/Hi6MeO0qYWKqHCZTufHkDWF6FOBpoGfndjVug5d4s/+IEfXIl+y1AA93OqY X-Received: by 2002:a17:907:6e0d:: with SMTP id sd13mr38598540ejc.90.1637954640897; Fri, 26 Nov 2021 11:24:00 -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 hd37si12033126ejc.569.2021.11.26.11.24.00; Fri, 26 Nov 2021 11:24:00 -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=bXBmNdXV; 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 4A63768A656; Fri, 26 Nov 2021 21:23:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074084.outbound.protection.outlook.com [40.92.74.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F31668A59A for ; Fri, 26 Nov 2021 21:23:49 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eVgv+mBAfgpTKDOyhFLyPKTcVFhdvLU+U8zVaQyNewvf4J2TQABZY0zpjNCehr5luWF/pCegOI93HOsx5gmEx03nG/3CkiR/IuWwl6/pSWZe2mD3M4RwHcnDdCs8mf3k+Cp5vaB8MWUMJpjbPlrrAQ/avbzCNR8eeghrEXUeLhCWlnzI3pp61ZMiiVMTRaNouByEkVFJQHnwNOk+Dmo7XEeIY1kXZouYZu1mKg+2NssV8V3RpfF4zQSIwy6ldifwnMTURDUD2uhzigAbZNATopTbwKbXoUT38D5i2GzhCD83FwMnen/K3ClYZdOx+9Oo5z4cVxHNa7nXKbKJmLe+jg== 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=FH/F6Yvj9Qclc1in/WPo5I3aIQaZ/CdrUAnO/Z2rwOU=; b=a7m/G583hE3diVbapU5r6KczcDX/BeHA6nBGL5vYQtO+EKhX6TJ9rSS1XfNwhAgt1ZZFEQUSD7gWaH3sNZXZfleUU6neBOBo+dG3/IL8KIimXr1y6JZyMvjADtldPtIaG3Sr+3MZLxSOKhfvAURC9yx+jBR7YRf0RfjYzY5R86y8wWhwMNWqoKQEiTJp/Uw56/TRkxOGS+OsoPJ7ZLmRQbkcgschmDJ5TB8HF9MtHYZEgIr2ZWVHosBIvhVLVE8aag/R7OZsPK3BQhlZ8EG4xR58jZqFO6Lo6kojMCn4ehKd7vItO2wLQRNng1JMsLOp+yAoAnOat+IsI84CE8uvsA== 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=FH/F6Yvj9Qclc1in/WPo5I3aIQaZ/CdrUAnO/Z2rwOU=; b=bXBmNdXVmta7Harf3b7dIp1oct4e0PkhGNGDkYFuisY3c7ZBUp/UqVMvn4KlMniZ+S7vjjOLT/tc9Ug58ZPRIgLoQC7YllvhgmnFgeig4LowysWGsylgC1IzqXCfIHw3qHiKbJrPEU2+DpyUCwuLFKBRmBW1wIPJsFOKDA3YasPLmLwKVCLe20k4YTLhSx8tGVV1ehBcblqOkbDAPeYiDltcttUiYQ1p4a2cF9HfQvlqRYHP6FwGdERyy6SETeQ3RBDxlmOtlvULgyG0VsSFfd+rfnF+VV3Z8n/ttQ2jFMg7c4K4dICxEkpsBoChyKJP2SR1eVvomaNbwBp0uZVTeg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6419.eurprd03.prod.outlook.com (2603:10a6:20b:1bb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.21; Fri, 26 Nov 2021 19:23:47 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%9]) with mapi id 15.20.4734.023; Fri, 26 Nov 2021 19:23:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Nov 2021 20:23:37 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [00e22eXbSKhICvUaYcPXwpvpdYwDdCfk] X-ClientProxiedBy: AM6PR01CA0066.eurprd01.prod.exchangelabs.com (2603:10a6:20b:e0::43) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211126192337.276654-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM6PR01CA0066.eurprd01.prod.exchangelabs.com (2603:10a6:20b:e0::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.20 via Frontend Transport; Fri, 26 Nov 2021 19:23:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 27c829ce-d8c0-46f6-43e5-08d9b11244e7 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIj0MyIIwJOZVqdG3Ec2eC8TAAnREW2HW9DSCMUni3/LBbHfkppHZb52UYW5v1xJmRNwmKLKVwaJ7OheRiNkFNvXP9m+aMbBRHlzGygOPtfIH6xRVOz/O1w/Y1yw+5GdnqLURDcnz762pqW3FERX6ILLilyzndRUEn1R8JHF94IFgQZhyLYhYKgCVlJluXjqISjXnHci/zTUp0S7P8ARhnmpRtO3+UtG+CKr6pjCOsewGcqdQ363FDFUHGBoDUBa2QBXPeYPcuKeWDgUxA0wDatyiFeEAwIwum/uQrY0IAXduDs+1He9fyUFECZlqPyxbROG068CsR8mxQiqKzqSVcTLEs0MrnbkxasFE63MTKT07KWXAjGIlHoOLtGtpQg6BPT6eoNumRPS36YKwVR1t8JBWv3P0JSebrsqAI3DUPSPHzNzeo5uxz2BHaW7c4sWP1CxK92xQJVKvFRIEUBOlHdtfnquC+HohpdfRvHo4ELxsIAuXQIcx5gsrEwOhihX7gZN6kM6o3w7WSJ89hkLv6lYWrRaWO9iXTgvVaXrASP+7R/CZFIXg7PY2S1pAGLtnDv5xuxbcBlyF6p8eYXkylr2nef0y7ekvDLeNaK6B6vHdOI6UTh3M6uQ6VrqpFkw4SjJ3VI/XwmpBm3o8Lmj1YP5WhOsx2VkNNrjh5eZMVmxLI8T5D3liA+fySkcb8Y7RzWowR+pdQlUQ== X-MS-TrafficTypeDiagnostic: AM7PR03MB6419: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +InHzNxoNrl9ixLmF9DsgYqIEC9yFO4qNnXpzio0fLur65Ymwirf4PRAASpVxpX1m1PfB+x+WgKxORgzFAk1ZyPF7eT8e1NKfGWTR/tbwkYHpcyZlDFCNdDPhEx3LNv8UgztA025dTEHcoZAcWhuBylTYAx9BZ+SMG8FgrrSdha4X8itPzHNxZxLDefRSZSmnOSvbot+0SziHQOWVWnxEdiOjEYhT5rZqV/sGHpeMfYpVK/R91LEB7Q6HZofWfRe1F90wQt9YTaALT5z/FucUVl8rVdrdnk9r73YobgGx+IcMnjNDRygMU4IE7xfHQkpMkZVf+o3zlg4PqUnqkbsMfzQ5+2d64aPYjE9+VddnfXK+EbO8FkpomN88CVxDRWCL7eXZYUV1lFVZ0VVpE9zikfZ4sUnaHOYRP5uwxBXJD/zOZAYaXe7yYMxbX1TPphTFiWsN96gdCX8fLoYdpUgL81YjMa4wBxUlyk2snr5OTxnhEyQAM9RHdxjiDEWWmfsP47Y/t5AhrZXSMH8G8p5ctz+eV160Jw6Sz6IacbZnwqnC8xeHT/1p0XcSK+GyfO6Q4i6kpEG5MRttr0RZXBH2g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zWQzdLGFlPJGIms3UOJrwgQz8M7Zvg00tK42d8LBRyhDbnXHj5zc+n+8guj/hAhB0tZVpEx/zCYLAQy58FjWUGXdVTofHtKCSrfSbGMCUiprO0nTRkNLkJiV+eWJoKCMbgFoH4HT7BPtC/8aUzlLtfhSIJBLvwGSETDcxRxhvBXtPCqce2vnXl6Iv6Vn/g5GfFBmJhddWzWxOwGF8mvhSpCqwhfZ5dVFypN2jZ4u180XMYbjJyZVU13TpkyqGhomu6c5rn1lC5djrb6Ht7e1k0DQbDEM6HIPfwlWiHE35JpNAnRZkWyjv28Xc0i6VhcG6E1clV8rjTnwh/aX9RuDEnFdqJFcVytDpW34c3wgn73Ga0VP/ghacLbDaCkeOS7qf4TIVTh5e/rOz0nJaZzCF7EP2XI+O4CeYamy+c6eIA70m0DmoEI/EsCpAh/49RTBIHpsTJVa6rh7GyY/++BB0m6u+RVlniQKzwrf2tgPrjpZwjXkFv4SZJmrwnkeqAWyIAhm1Z5C5VnkGNVzImKJpywM7nlvBoyczmZp3+iWbvsJ8d7t7pE8x0dCkB6twFcg3FCVs5R/h7X8bRriV2WFrVaQ0BLLPU8+nFrvOpIEXKJHVqkygdVQTJiQmDP2DyaH9Beu8gUUUyF3O8lYSJpC5a/TuOh09eVwwvOeEUs/C2NBFBe1Xciz0oV8HHrRhlNO8EBckDkhlfcP1lME6LPU1Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27c829ce-d8c0-46f6-43e5-08d9b11244e7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Nov 2021 19:23:47.5968 (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: AM7PR03MB6419 Subject: [FFmpeg-devel] [PATCH] avcodec/vqavideo: Remove dead code 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: 9Y5pDVTkU8aL Fixes Coverity issue #1493344. Signed-off-by: Andreas Rheinhardt --- libavcodec/vqavideo.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index 5466e25cdf..61f0a2c950 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -692,11 +692,6 @@ static int vqa_decode_frame_hicolor(VqaContext *s, AVFrame *frame) bytestream2_get_buffer(&s->gb, s->codebook, chunk_size); } - if (vprz_chunk == -1 && vptr_chunk == -1) { - av_log(s->avctx, AV_LOG_ERROR, "frame has no block data\n"); - return AVERROR_INVALIDDATA; - } - /* decode the frame */ if (vptr_chunk != -1) { @@ -716,7 +711,7 @@ static int vqa_decode_frame_hicolor(VqaContext *s, AVFrame *frame) if ((res = decode_format80(s, chunk_size, s->decode_buffer, s->decode_buffer_size, 0)) < 0) return res; } else { - av_log(s->avctx, AV_LOG_ERROR, "expected either VPTR or VPRZ chunk\n"); + av_log(s->avctx, AV_LOG_ERROR, "frame has no block data\n"); return AVERROR_INVALIDDATA; }