From patchwork Sun Nov 7 07:57:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31315 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:dc01:0:0:0:0:0 with SMTP id b1csp2260984iok; Sun, 7 Nov 2021 00:57:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzMCsZUNXD/iz7/quY2uvLWP0b0pcWA/ovaiYFb40BlT+kduGNGBAljvJoIzQk1XdOkPHwd X-Received: by 2002:a17:907:ea0:: with SMTP id ho32mr57632885ejc.191.1636271846309; Sun, 07 Nov 2021 00:57:26 -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 x18si18361742ejd.736.2021.11.07.00.57.25; Sun, 07 Nov 2021 00:57:26 -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=Buq5TFxc; 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 6C08168A616; Sun, 7 Nov 2021 09:57:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2098.outbound.protection.outlook.com [40.92.89.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 347CB689FB4 for ; Sun, 7 Nov 2021 09:57:14 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QajflcnrbLOnkyCzvMz19GlQKqByW4efSOhab1GhDOC6rAcHnJun3o4VKCCK6NoPTcp/JxJ5KK/WWFy9kHYtRXm7UZTsvX7W28EkIGo7zQdEd8AGh8+39wGbbQFQHPwTUpkHx+Lm8VzTipLUecboOxn9AxKsw7A0AeNdLdvytVfeyBOUqEO32ezrr0TV4rlysKyId+tWK4qHFKli+v97HZvit6iWA3PvwmAZj8hI5J0KY95zdpzvW3WyWnc+hmRCKcwU9cC61VU6plMOTkLQ3BIMs2M+hRgO1UFuXH64dqSVD8Utj8+7irZMRUnX8Z5tUDOZE/Rmcq5bSxkipxMjSw== 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=3ezGKR7qKkiXikT3Uie/LTzxbaB8ttqMSWJmGd5F1xQ=; b=ILkmrC/PYoSRxtKgDQiiNa3/+PAnTGk0OL2BWSfssF0x3C1BfsgTIyqJsxJ6Tcisc/Eje6z7mTy5+SPDM+uD3emvHxKcZGIXiiJKe/gP8MlzddYo4AteD1eNpYA55EjTXGulzdAFIPXCL5MPKeG8b7gnp8fJnHpu7/Mrt9UtgSycB0vRGEHllclQXvVwJ9jNXOfCrJvUJ2e9qj66hLmnnZZ4wEfc1r9GPaXWOvQ9Iwmu90xsChZfgB5alrWdfFAbf/Xa2ccEkk+/X01Sn5O9+aisjW8ccuw57p6n9frZUkvAdwulWrzG98RbrCcLyDD2MTh784gXBEh5FwS6PAoebw== 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=3ezGKR7qKkiXikT3Uie/LTzxbaB8ttqMSWJmGd5F1xQ=; b=Buq5TFxcS+C51IRnmKuOBfz2xwY2knYZdiyPQzPTmSZDHDhdpSEBamI6/WY6f8b0KP7H3mmpRLfPBM73IsF2J1VVR7ZgPkA4XI49mvmumo8tkZE28V7YQiRpBgx7uUFHfqgdZ6pM4bKP5wqYb1BWSFQDUVYkJithGLkAo/Pr8HxIJoK0HyzoYFYrP/jfPZej0UqJbJzIYnSnQ1quajHvz2wiuERuPFeHotsIOA9DWUe7lZddTIGj8kFM7UUm0WCezAMuCjIYJYqHa2NGQOz3g4uKnRdIwYdkZn4WgGjWJrI6+Pe53RDi1gY6xxJjCnNInrbhJwiB9MFGV+QHLXAtIg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3829.eurprd03.prod.outlook.com (2603:10a6:20b:21::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Sun, 7 Nov 2021 07:57:12 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%8]) with mapi id 15.20.4669.015; Sun, 7 Nov 2021 07:57:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Nov 2021 08:57:03 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [1DiMn35lW6b0zJRNXodx9LgcSRfjz+TB] X-ClientProxiedBy: AM0PR03CA0056.eurprd03.prod.outlook.com (2603:10a6:208::33) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211107075704.116782-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by AM0PR03CA0056.eurprd03.prod.outlook.com (2603:10a6:208::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Sun, 7 Nov 2021 07:57:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: efd66073-def5-4b73-a1c0-08d9a1c434aa X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiToJ1zOhCTJMxThXxxCkMRwJ5nYx2Xda+uWqFPtAh/kmCa1Nln0GNHXtpqT1AbkPDwbW/SXpci4Ay+lCYydgF7B2OycwmGeTan92+Ab+x/VRPnO8NBPcqqcpWskXM61tklmQnk3dZ/eg6RTX6haoCWYu1IRAKUVSN9U80jg2xT4GJSmqKUP7gulCgUn73KombRiiGaYAHNlb6nWQSZ/y/98vu8LDEPisOYVdx8mZgE4NAymOMGvDzx+XYsiaLTJo6ECykp0s7dxd6AAfr3MsRqdaQ+juxAtyrFZPE9Tkq5QZBUGG0fDQSowbQYkh06bLieJhLadOcvpGl0AVUqf7zyP6+c92aRlTNM3A22sFX4q3UkwgeVtObB3wDkLojda3Ae+UDa9kuKLyXeOm75vO8yVSiq8zVjp92IBGqU+a0WDVBA0FMjlE19ghDtQnX3/fTI5m8/kIBC2+5hOmxrm3pkgkZWnX5vOJMYVXFCF7t+aiIjm109t+7uNywAJm/9qZtzGQyAiGmn2hbfbpaCeFBJCS+Ckz0mc6fdZOwOpoAbCZfi08gvcs1LuY21qEf5vMTUFxRUFfFb8+cRGZcpLpVEOvPWM5va6gqYYby2YCwOH3APo8taCUu2ln92JMeX33j04JvoKJCRaO53N6y0nFx3qMIT06ur5unv0jJzHVmJM4jGPSyjkaDbGs84InmgElVC2QzzOWm7uxYmruVoC46tSrALKOPOnLzlncdO9q4JLTAp0abBWY1dZLzBxZaMw5MY= X-MS-TrafficTypeDiagnostic: AM6PR03MB3829: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YOlUMz50zWRrj7eeOdGmrLyM+C/tpN4NrqDj6xADNtKJMUMVx1E1SG39WBF+Wcd7kQdAzFLQkbE06QLvTFmdm4U0rcAWh5gQSYnS2+y7EtSbMsdTj5FS3dsaFKfa01XRBfFhWTYFHEINOlfKeap1sVFaYNkjzHK7OBAb9L7EXiAjBUamB74eNPKG/vUk4nYXk5MyHiSxS6gEw9j7Cl8OhMdmlKziulnQagav16AlYqYvO1BDbLo3Ip2v//klPdwqa02BipBMyPo8pzQGrupERdzFQ666S9rPLRK/EGoTaWtLO1iIo65dHPP+9fzzdqi+LNqkGBe5UDQdpSZ5dPq8FbXZkcWApwzzIE6bfVUikguRnRoWCORyALWfWamxf+HQpYwPFuuMhaDSZAIDcBjHe5qojzmxq3t5QWZ2Ee1t9hlxIszvWrb6f2bvwHAhRif3cWO9emP2jGWuGoGcSQUOtgUH92jHThByQSuZb3Rw3r0UFgpQFL5m56E4tkmZ/ELKAn4WkaFZMRcsrnks92LQrY39jqhwj/Piu+Ps/dl+6Ac= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: x+qCJUyX+TURwoxAngWsyNQkodE1vVY2s08lGAVFMLwB6k0uy+oxB8St9d4o3ISXSHc5eQqbj5HsA2ccS5beJWKFrIwX+zwEkv61nRnW7t/iw9iZHbFSFWD8K22u0mVf5BaytWIfaOqGfEDVOVvNwVMzA43DsXaI4FPAnIM2Vysnvq7am4h5yBYXseG/XhVHSKFy0W1V4bD6NO9EoAVTOD+rUSu59nBkqtSM4ygtaUBi7bMqUuWAxZ4t0h/tILU486+MKRq0IjwpKxMM7nlspO1h3yCF+EQUZLf4fWfOt4myrr0VN/mXZsWClEt0jv/R1JMMpOKrU0sezwuP/XNjMgJEN8uuQbX02H5Z04xCi1rgqdUo/d0dQhwJKY1tcMS1hLt85/Bihg2yNHXiw8axUu4noigS/k5mWHG6xjO4M32wsrQu4sWpQxdxvsJjWv/K7hMt19BIXOHQ0AZL2kkemgNvEwDQjfRbyAFOhmNCtvneU4sSU3hHlSbjg7FaKO7sF5p7vD2iJv6AEehLymXPfBYtrWwIzRSHoT5/5RGjWBY3QYE2ZQ1VNIbBuYR1Bdvx0q3Xt+qg6WNiQKqHbCylqRqv7uTakU13U7FSiY8Vvt0w80r74/NvfDLbmN5jkbGs5z5thAfRa/uroraOuSA313FI7h+pU9a+CogDaWCxoTDsYLIzCaPg7o2U+zUPFChKpX3pwgZhmG7N4i8OGj3PGQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: efd66073-def5-4b73-a1c0-08d9a1c434aa X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2021 07:57:12.2111 (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: AM6PR03MB3829 Subject: [FFmpeg-devel] [PATCH] avformat/hls_sample_encryption: Fix precedence 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: FJyhndXkSXcY Fixes Coverity ticket #1492869. Signed-off-by: Andreas Rheinhardt --- libavformat/hls_sample_encryption.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hls_sample_encryption.c b/libavformat/hls_sample_encryption.c index 396fe97921..38795c7fb0 100644 --- a/libavformat/hls_sample_encryption.c +++ b/libavformat/hls_sample_encryption.c @@ -268,7 +268,7 @@ static int get_next_adts_frame(CodecParserContext *ctx, AudioFrame *frame) /* Find next sync word 0xFFF */ while (ctx->buf_ptr < ctx->buf_end - 1) { - if (*ctx->buf_ptr == 0xFF && *(ctx->buf_ptr + 1) & 0xF0 == 0xF0) + if (*ctx->buf_ptr == 0xFF && (*(ctx->buf_ptr + 1) & 0xF0) == 0xF0) break; ctx->buf_ptr++; }