From patchwork Sun Jan 9 20:15:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33168 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2177584iog; Sun, 9 Jan 2022 12:15:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJx6wMU9EuI7QGoGSYK8ezfSqph0W9yOIcKwO9GV0Z9Z3K9bH2KeRLAmO1+xPTehe50FSAzo X-Received: by 2002:a17:906:7c4:: with SMTP id m4mr13069433ejc.655.1641759329875; Sun, 09 Jan 2022 12:15:29 -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 r18si2302702ejr.58.2022.01.09.12.15.27; Sun, 09 Jan 2022 12:15:29 -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=oELEZfeu; 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 16CB768ACF5; Sun, 9 Jan 2022 22:15:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067019.outbound.protection.outlook.com [40.92.67.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 475EF68A83E for ; Sun, 9 Jan 2022 22:15:18 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LF0IaHCcMDj2MzaxhGx9dAvbH2Kdc4Lc/vFbyT5vkmSy3K+oomNdK7q/1oXeGFP0YF4d5wzm+lxWJ4LbTTqHySrfNG+Q7o2xi750PMGJRue2wfT7V53j4uaTGyTKWhQN3nbC+0C8jPVVjS9sZ67HiHjDSkaYWvUtXphbbFxERGTH1hG9dqYszIJaKdrWtYe8s5uKFEOibJAFdKBRlY7a9w40GxT7wchgs5kveXmHQHq/IOJ+BsqRKjUG5f9FJks7agzUhUjDM/6N10mkYqRR0svHTZN4gUKLsZuf14wp9kTFagaWSTU+Vsmdp/M7CPJTbFkC1BGg/UxWl0dnNJmR9w== 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=lmy1ua0csvBEr34diWUnL5++dkNXJrUz7dhrgCNLTGA=; b=ddEL5g0WktXDSH0bDm5xrKsoyTkzUN+ve9LZSIXoaK2JjCvIwPz3wAz8LnqjabDvxvVSbDOFPBeUteMngLvF6Zc5u1WFUJBKn656UnMPzot8dBftsN4hB8fZ7tTfAYxw8UT6lAGuPo2Etr6jmMqMZWv/wblczi/d7s7shs1uK2QrHFoS89WB9CWPMGtNKRPJmc0ppUoQtYWBqi6HWFCIWZh6Aj/ugZ0Nwhl77FsObX7Pgzz4jiK133qfXOGFLRm07yCdNGWUWcRwdX5ozjp4Vi3Q4IzBFBP6n2d+zO0B/RHpJfC4taI4if5vPf2nNx6nDtMLKRsu+wOWaWcH/SY7zQ== 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=lmy1ua0csvBEr34diWUnL5++dkNXJrUz7dhrgCNLTGA=; b=oELEZfeuBFxKBjuxme/PxioibZp5I/BCV6fqsQy8cPmgI/yzKZEYuMpgdKKay2BdNEfWWXJil409Su6zZ5d9RxC4zIVYtWp9AOmhPzgfIlJZZsuiq/Pb/BGSgTS4iubmU9/0F0fRFYccaI4B4SgxDke/1JfQ+8CqJc46sXLUiHerPmA359EEA0Kk3s/fuHatS3jMiXGO56I+6b1BjlE6DcnDVkBj3HWzQEwnZkrYaw7lRY9bki2nKTHW3r57DGDuIxEOry1vH2EbWatBvajalmd/lUfDxKhyrIsIMrk84NAIQjXi2PDP5eG77jDNsUXJhdC7KXrRf+/qGNM6m36dyw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4453.eurprd03.prod.outlook.com (2603:10a6:20b:10::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Sun, 9 Jan 2022 20:15:17 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.011; Sun, 9 Jan 2022 20:15:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Jan 2022 21:15:08 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [x6iUCVITH9e+9D7WPrxDR3Y1C2gThXTP] X-ClientProxiedBy: AM6P193CA0143.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:85::48) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220109201510.4129813-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 749ef023-2087-47d5-02ee-08d9d3acc0b2 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1J+vcbIxt8vO55tYaky+ZCtLm3Ts3mzoLSDHMDgWR+UMJaO1Ro62//gpHT0DjivcwVmjmdS1TmYssjKgQZQx6kr+tKr9d7xjpTMXiQMsh3PfBGgEStJ27L3ew12jYKEuJfYSMmCctfpma4OkoQ3HHrwnQ8+3KDy2MolEQW7qj3rkl+jb3H8HgBl9rm4+IExiImU1T3k1R3valJEU20BhmliI7VdQYSW6xQRbU0sCn1HIwSXFqx/W86Yt4jmt1DtVj7ewYKUa4z1dLq+nFGNdopMfOL1hTr+bYQWqJvfK5Pwuim/Sfn3Vpv5/Kh7xTr+QisZ8WoaYoOhKAyjsyWeM5GRpnnd74pMjCI/8gvnoasJ4yx2wNLUSMhW47QQJYBAHWWKS0zy/bxw63jKNUgkuaQ5PG9ze46ObaaoXV9+3Qeu4KkyLb3UUGuiVUHjuAWZKLu7uNBgkr1W50iYQSSaW8LYz/hRZpLsh2jdt4vLd4d91AuRZA5eeVGEL+Kw2bMtiTR+mqMGbhSXofCLVqXMtaR6bK+LD/tzEASA3RwyBSbjcjropvoW7HxktuMaNGK+redua8nUIAe8Okcz8HkP7xQaJ2+ns1+TPIKte/KPpl1e3dbDtYj/1Is2r6MdCCTKnqSWk9ZSj7QJ6GxMXnn5nl1nVZVOmfsKdF96TTayUQ9jCqw35sZ768BTSw+ZCsHwjv6yI3HDo/y4oM/zbHEZqudEjkAatRXv2SbgziWmJpvFGk= X-MS-TrafficTypeDiagnostic: AM6PR03MB4453:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /xVHPxgyQ9aWRP4VOPY7M+mkBA5KFaKdHFvQSwlpWPA2eeEV0yqENGAvzKlJ2iyRFmYI2RiFZjcPCeyM5+CgZZMhl7qDlsZfPZbCJw1LnLZQ2GdmcIZdY1MmP8VPzPYwRcoODEqOHfRKYTr/yDK0AWm24CLcdcJChmyNHuhvp++MeDGMzx85TE1w3oCXH8USbHNh3ajbN5E2XNYPQhSM1sPf7O3dAqBXmfVMGH73JZUkByL8u6JGLV8gH3d1s/LfVZAPHYlL2OMo1NRGZw3zO1dQfiaqt6wxUUvJL40EfKaGeGns80SXJZLvWEwVxQBM/9m4ITzpO4ZI3jxOqVlg8SQX2hxfCDZTed/p+mnDZhb359pmBjQV+guY08J8kE/+bKMc4hXJ8y4H1TZO4EpWVhrbnun01mHKn/pg6y3ezlFEJ1NREvkKZpppwUp4b5EdRvWJwCQYMvS+Viw/4+ewexb9rcnpODMP+Xxuvf5dZrpBfgv6l4P82VNZ6JUQFbpmtFBqD6XiCwvywi3M435Rjx0qIf2NmuV/lxYiT4Xg4f/Ulh60XuTvwSSxMdRjH52SPC5e1nummgwC64A4/HR+Cg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ErJgVHZLlSPz5W3yjwaf/XY/pDjcd8U7ppVmU5VBk3evHgn41cGrH2OX+YHRO8ePnLIiQz2BXlo7+qN7J8rwqyVkW7mXSxkuCX3WTn7JM2Z1mqRW+vZwYfJO3P3r+FrBX/jrut7BSNU2TLsXYeytWyvaoHuqtUv4eFP+bBwzqg420JNhZRvgl2CquF79xHpc0+NMAZD0PwR6rwht+K1H8MeyX5zqH4BNMIEORlDBgPfxTLL7JcdhTZ4297/icVC/tgQdBHwdwXSVPxyUqOvDvwP3siU2x0YqphbEM0QRwupvsNotiYDMtJ/25oCa+0fxgOmmYm2ybMZLwWLu5DoTyCyUpdvGmsEKUb/PonCh4y37/YmacDB1pLMTz0D5Gg4UCLCHsXXtqjYjrZHcTnhdA15PHK2GRzwKbkkHdijBqafT8ZuyhuhM9iuhShzGpzVzegvOB6qDcQRY/narSsJgdOYkm8nkR6DKm2J4kvEsLW1tRFq3CG/FmQoXN6nbeFU0OD2ZLxPNXrnrr3sI/IijaJ6rXa8BGGKJDLaJAbbkVqJI2N3JSQVpUvI/JqQDWE5iaX/6BYFhG5TAs/TzHjgi4yDj1Banqw/yIqTbTCWSyWcDTRBFE/uCgMMjDuF9ZfkMvYMN7RNxctPogGWieQ5Psr2565rl7vmZRAGwrnUBBGwfdoUxlLYF1Ip0VOiZG7WiolEtyA/SdRD+sWZ+F2kE+7mCF/Xh7Ub1GoHGiuzyUDuB6Qo9bnSD3kOnxuhSceLelWSEy1DLs2BpqNcO3SCQVgXLW+3vC7y5f28YoZ7ui2wDY9c2IdYweBtdbxbwkPDuCOZux6+j2Iu9l6U4OCO+S6FgzsNn7/DhXiV3AIR7XYBz/M2WHP+rvK66hFNsLaGUxO0QvLhFwfciqjN7PhBaUcBQ6V7mnxII+BqMu5A4ZjNIAx142cw0od2Vk+vuWVhV1zsSX7tMcsOXn2cpUIdDhA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 749ef023-2087-47d5-02ee-08d9d3acc0b2 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jan 2022 20:15:17.3343 (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: AM6PR03MB4453 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/vp3: Don't output bogus warning 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: 5GBMtsrgxHP4 It is perfectly fine to have from one to seven bits left at the end of parsing. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 5b9ba60f49..791e531862 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -3149,10 +3149,10 @@ static av_cold int theora_decode_init(AVCodecContext *avctx) "Unknown Theora config packet: %d\n", ptype & ~0x80); break; } - if (ptype != 0x81 && 8 * header_len[i] != get_bits_count(&gb)) + if (ptype != 0x81 && get_bits_left(&gb) >= 8U) av_log(avctx, AV_LOG_WARNING, "%d bits left in packet %X\n", - 8 * header_len[i] - get_bits_count(&gb), ptype); + get_bits_left(&gb), ptype); if (s->theora < 0x030200) break; }