From patchwork Sun Dec 12 15:42:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32332 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4313773iog; Sun, 12 Dec 2021 07:43:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJz+hV/Mk42jGeY6g5qu6ZvBDfC8+ABRX/gyHrIyWO6Rlgs+o32azUugEdJuFNtvI4yiKBxD X-Received: by 2002:a05:6402:50ca:: with SMTP id h10mr54207299edb.70.1639323795149; Sun, 12 Dec 2021 07:43:15 -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 j19si16752711edj.137.2021.12.12.07.43.14; Sun, 12 Dec 2021 07:43:15 -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=IbzG8DiG; 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 CB67E68ACF8; Sun, 12 Dec 2021 17:43:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075095.outbound.protection.outlook.com [40.92.75.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 40E5D68A583 for ; Sun, 12 Dec 2021 17:43:05 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mHxkZddZeCQqe+QIFuNx5rILLIlS3Vo9gEAQpQjVlOiq6HJBND57gk5WeqWVcCEfNaDDa+6n43KeFkiQzWlAE8D5Au4FDkBLreL4n6xh8NMoOBq+FHH2wKJ59IvWAfcVMc3pjARjFqVgMSC92IJj3zqoHQGLRxM51TPWS9lvTeyJA37ZKjQYVRVWrJVkGj+PxE/WgGJ6lD+Nvvc8sGZwd7tdBc0DbiswFufq9AIjVHcs/5NzcnHSHaJC2RcUcHWzbHBEuy4HlRJUUaZ/c2IIF5AkVO+DGeoQA2HhrRXFZJcy0G5spLtg+QJxsRzJbJHROsIWd1+P21YC/zauLDH1mA== 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=u4MikJMlvJ1LQwGBAeBJunn6yuAT9T5Jb1bEmTwDRY8=; b=PpTI+dg3wdrAOYdv8CcG8tPOYERmuK1tlZGEwQO79Ine0Xb1nN/m0sjBYhXf3LRbbL9jtYd9Bq+BReoncmla/wz+gZ+xo77fyrxQW1Q+yCzVd1zaf7BnlW+BezOFpdB0S5Dx5Gb4i2srsh43A3c20ZnYgGYWnQx33ZivLl73VPdGcWLixlGlKY3pgzPu8KRqSPSm6Zw2DkjTfh1ZTbe9yu17oGeDu2aeH4Mv2lKeZGZ73bKnIwKc2/ZDH4NctE0vSTEUa1hJ6g5aGCWG98GERmKB1HVvnx+sZxNJoiovF3iuRJbhyujvXQtNvTJClPEScYyruH2BwJ7WuxvSf5/r8Q== 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=u4MikJMlvJ1LQwGBAeBJunn6yuAT9T5Jb1bEmTwDRY8=; b=IbzG8DiGsPj8TnNt2OdG2PUKUChrKwy2ZrFqmapuYsn82p4U188rlKf/y5oxcGqwgGuKSrFGp4FpxbTSxBCw8TL3kZ+aUqjkEgTPO4snhgvyiym07K930Qhb/gArOrz4ovizL/TqKjZkku2onhvsyPovCZ+SilgM2cLBYuxhHVbZYogVJzmndrEb5k4B+B0ymHZIKv6GT2/9MFE6LeKqU9VoMS7Cn+j5/cMRJZhgQUeB187oKo9qX2wHJjLhVliCZlTauplJr8icFgeKVWACGj5g39yBH6mrwMCffIkRJQdk8flreMbKwaB/34JDTdSPaPkVAmM/8hRCIzXjVM57ow== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7112.eurprd03.prod.outlook.com (2603:10a6:20b:297::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.16; Sun, 12 Dec 2021 15:43:04 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.017; Sun, 12 Dec 2021 15:43:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Dec 2021 16:42:54 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [lIxf9vpVb4tUI+FHc0dniuNLJgBG0MmL] X-ClientProxiedBy: AS9PR04CA0056.eurprd04.prod.outlook.com (2603:10a6:20b:46a::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211212154256.1511544-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4188f53c-9669-4534-0b01-08d9bd8615bb X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRhTeYa9y1Ya27Xypab/6mEutVvTfhKPnAMlCOw65Ho6Z7T96nTTl7GcvZ3S2qGS9XJL6GX3KC2gn7E8GeIw0Ltarm92FdOHVNEbGKz0RtK6a6NoDsPZebQoY1LfwSe4l0O4dtcPq1Zcv//irqQGEL1XrO0BwNTIsid0n0Y5ZrIEzwmK1jp79+Kx/8vNyFJcH2PgxZCQWhAboMQjzXm8AbWpukHoI8loo7/G/lV3Zrbg3VwNKR8PqnwXcWbrg/BjcI2rkQQQjIGwz81XV3I9QSfcqNvvsA21geinqEAKHhVKJMnk1PRlH02cr0fEqwiBiCUAOQTgERbC8Fq+lYx/jEfh7Kjhe52a+aPCtwd2YbZwW+Wf6ejy68Nuw+CLy0Lmhn6hf/dzB38nau23NcbGrhPdzCP4NB+bVXocwNr8b7L2eSu/f4SZhHtQujdmBcBfCCv1RE+uftMtLP5EHGMwYOfZBbZSh+yygktwDc3O6f8CdE3vTFjkk1L/MP+664Jqic15vRgAmEwggaJSAiXagqJw2F27yqO4n+y6+WCJskvMppzFuxQMYWFCCBQkjNpFhUdlZtp5yuDKnS4yXGAIgNSt3hzlzE4Fp6xFOSrgBWksHx7XGtQL+PJmAYASqgpq1S3YApJyB4+RuoCpE7l9ocZ+sbedyMJnSWW1aNb+A/LE66RgqtEEFwrSnVGpQ9OOcxYwGGDcCjA7wvzuW9zRpdVsXa4Poj8bUSDy8JLdg453KSyhV+Q+Ud3QlJU9pMZaGU= X-MS-TrafficTypeDiagnostic: AS8PR03MB7112:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BUn8q4Zkl9gCJ6A+kmQjZDV7UWkE0of2xYdPyvHjnUPEr5/F4hUcg6LKUi98mAbf9sQeHmzzmcK0QxikHhicfD21otpbiZnHe2n3aYSsjBVjX06hyq4aJcBK04zMPV76IdC1VcRUrA95MFrCGDsgfZw6JYMTT1AS+PCZy34gawgEfhyZgF6oyfBrejbNPipFutu0iYjz5BbqoBccatO4R464UPZIjeXh1Ij+jNe0gnYrXvct4LKXr346c90MGFiBFKXeB4ivob39k5MGn5zPKlz38peWEvb3ab7oLH7kimyteKHGTI9AKuw6pc/AZHT50tGtSxL1Bn4G39JAxdDLPJ3AI67xA4xr8/MylvsWYPEqQzfkowRR9DIXSun5RESksLmfFreDPprN6DHHrGx0EWWSo15fNm17T77U3RMGF615oYLv2rUcmTg1e/YM/vDsuTa/GZ2e/C1ZA6TQnkQwgc/XT1LZLOp4pQaBa0RmRVRJBoZXxTbO20ocCt981MTgBaMi8WoM8ZjMOnH2fmJlqnfVotB5HcIKC8WqZNR9yQAeff6GfILIdjurddBz7W+EQ5WLfMx6d1ubub8h1UfAIg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 45x+nUG4ze8QWrPTpkjDRnBoA+q/d3O+CnSFpk8Yt8lCvaiA1SG247thqrZe2GiSGdXt4WhJE608YnipwNE0S1au03y6Bfqc/z5EOmjrCFszCg21SA57M2awfMDK6WHrcdSKSZdWeMF8/I2/el2qnz/M8kZV6SAum5gc7cPJZo2YV9VrKzXj0qVU/g7Vo23WXbECa7h57lJRwzee0KH/2bIAFNuBPKuFjRgPkd4pHX4IokwruHOI+ZS43l3De5LOKQ/rTHHFHW234T7Ipz6k0080mVJpgnDMA8EBMIhw/1CTaiWhOJqr7ydsWU+WP3t9QZiFjXrDHICDfjdDxf4XTEwrqUliX/0YRdHZZoHU8RVIOvtiUJExbxP0iRCPV9sEswKN/7HiwBxDHD+B1baBeqQ7uuljMmguj1i/IitHs6bVozdQ/3WtO1zFKKYil8/DHqnoj9PMNTaBfLqF4EjlfOb+jYF/MFMIibWIZUqsrXut77xtnuwcvko7ufw6iwbMqSX9RInPyXFDUed5kiC3JHUccwqc1Jb/0YNNSh8Wz1atyKupwhZp4kMbCvj+0pDuhy1oOQxQ+kzdkrdSQbAIpmx3alDTr6kNCJFv4Iyu8jiv5NlMZHSAIWEn2CzFMhyhagYRK3d+q1ZmksFmUsaShh6VW/Vrb2oYFlA7kSrLzyp7Mh4Wt6acDE76zmZpAK4aelRDbNJU+JS5bExSQdneZfltCneGraBanKyUTagj3q5PlvYW1CHb+5M+GxgCqXxl23gzosCLmMZG+q377svyY5ucrwO+0DrYlEhUhmvWzQG0ChSmSqaZk5JpUIfnN/QFBkvHfNT0CisSwD2mrnW9Ic9anuAlcsYFlKPatlav+96r/GMM7ceTMgNagTm8r5nVgNsyiuiZw0s5gUra94JmT8MlGZl+JJRfQFkMmaJz0l9q5hY6TYebLu894Fj+w/6/zyD+Fh6NpqJ5vtcK/Wgu+w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4188f53c-9669-4534-0b01-08d9bd8615bb X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2021 15:43:04.0607 (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: AS8PR03MB7112 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/speedhq: Replace always-true check by assert 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: DJx0CZBzuFql Should fix Coverity tickets #1473572 and #1473504. Signed-off-by: Andreas Rheinhardt --- libavcodec/speedhq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c index 91ba80ebd3..743dacc6ce 100644 --- a/libavcodec/speedhq.c +++ b/libavcodec/speedhq.c @@ -295,7 +295,8 @@ static int decode_speedhq_border(const SHQContext *s, GetBitContext *gb, AVFrame if (s->subsampling == SHQ_SUBSAMPLING_420) { dest_cb = frame->data[1] + frame->linesize[1] * (y/2 + field_number) + x / 2; dest_cr = frame->data[2] + frame->linesize[2] * (y/2 + field_number) + x / 2; - } else if (s->subsampling == SHQ_SUBSAMPLING_422) { + } else { + av_assert2(s->subsampling == SHQ_SUBSAMPLING_422); dest_cb = frame->data[1] + frame->linesize[1] * (y + field_number) + x / 2; dest_cr = frame->data[2] + frame->linesize[2] * (y + field_number) + x / 2; }