From patchwork Fri Feb 4 15:16:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34124 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp3493825iov; Fri, 4 Feb 2022 07:18:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJxJ2o+xJitiD2mQsd1inxgxyIHTxwq90E3xppDqR3yjG8MnlI0YcIuKIvy8e36b9PVmCY6g X-Received: by 2002:a17:907:2d2a:: with SMTP id gs42mr2982036ejc.106.1643987882924; Fri, 04 Feb 2022 07:18:02 -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 b13si1466026edd.601.2022.02.04.07.18.02; Fri, 04 Feb 2022 07:18:02 -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=EvqdeVdr; 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 A2BBD68B2A9; Fri, 4 Feb 2022 17:17:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2060.outbound.protection.outlook.com [40.92.90.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8060368B2A4 for ; Fri, 4 Feb 2022 17:17:15 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NAmuOwBT6wq0Y+hzAtlNpGVlb5HWoswxFCLue0kxzs6rRUNVSpgGwTLMO4jzDsqdrXztV++gkHsOOzjluCWUVYLDhwazhtNjijtfMH1HxA4jotoO8ud+HIj8klA2yuMlYa56Mv932lDjvtnbAAkdOC3QZ+U/WwCK/Kb2K5F9Nqt0mEd1Ekuxt8ivzr9Oisih8gfJ3uKpGxH/inu4W6+TFjv9qqtmCIXmpss8q2e9cZ/GzBLXSIzcMPNMbdfrEXc7JlMBRAQzi3ckBwuwyH9Qde5fYXEFd+4jHC7v0OAFkEDmNz+24heilLRSi4UuuG1/gcl3vJvsMyPhBRpCgGUxHQ== 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=++cncbfRhvkveHkNsfy9lsTDX8SEzuWXoqAySs4LQug=; b=H/rgcGM0tkRb4Qp1i3cbO8gxFfXbnnX341La1G31Jp9LTa4RN29QYXHswO8NcGHPjDiuLNyTqlSda0IGOSAfHN8KF4uWBLsJYTkqMyT4SW68mhUXsfAzSw1Ok7rsQKVJbAYFgjQzfWGLZgsw1i6Dsm9Za+hkO++xUW6IP/rnwyaUB78TghcaDqSL12GZhnjP20Vdfb483uyHcFfuRKdX5D3y6oay8FtwFEF2zWvpcd6P5pEcZ52ZlJJLQph52UXRnYywrs5fCdDXTD2zN+0wmfQPD8aQa55DO5MZqKix/UBvSqY9PbXlwfSSAPZftPjDJukIv94d1jZY2YGE+APj6A== 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=++cncbfRhvkveHkNsfy9lsTDX8SEzuWXoqAySs4LQug=; b=EvqdeVdr1BALPM9MLb7C/l2j0N6gv/0j8wjI327Uf6pCi+pEe15O2QH/iufYU+/S5/f7FMgU2MJFQzVjNP8okmiIOz9+j21NMqlrIF7ZGUKfrD09hvpJdXxhtdAd9zVIxE6dpAQGWH1cDywkGKU43YL3mYcNLVU6goXU/M4O1b9I5WjXEBRQ+QBvVqFz+MFznykKr/fkHJXP4gX3Kjq5mTr2Jlk4cJBAkI8+eDhHM0CodNEAlWaoAOXwadLwxTWSd6Yjq/lFbymx/J8KuWQzaMV2IdowjzMIUqjmit2hWE5MNquwCxFmVpeIynjIyht7TaS4ppROWOGh9waeXVSDGQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB4703.eurprd03.prod.outlook.com (2603:10a6:803:5d::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Fri, 4 Feb 2022 15:17:02 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4951.014; Fri, 4 Feb 2022 15:17:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Feb 2022 16:16:48 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [ukiI95vjBcGmd0DBtAMOympW3+fbTOQJ] X-ClientProxiedBy: AM5PR0101CA0032.eurprd01.prod.exchangelabs.com (2603:10a6:206:16::45) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220204151648.2148917-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c8a7e3de-0b67-4150-d15d-08d9e7f16552 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSjtu7sMDnYCqklgc/dtjmmRjHoIG/rcZfagTGpIJRp8+sAc50Lc2oxGxtuVUDfqVznrylW5apLSEWPKB6pB55UDpBPHaqWtGCdmLixycxSUB0RqHxd7k/pmuJqWnC0P1xt5sl6eA4WcnEeVsPcD1oNhD7Tz2V6layzwARrs622ys8J7zeQbrs+i/lo8gBDDmJYRjt3iaPwVTNL4eeq+guocCT9Qc7zJC3+i/cNpct8LrTC6Ek53NKNgPKfDMn7uZdVU+ejEhBXeswB5N4fOBGc/8WkiIpAUrYvOk8utWNXg9DJrYLDzDyzk4Zqclb4GC5puRa0WxfZA4Lbv+Q++VqpWcNwqRkId00mMjYIjOc1RaJTimb5nsScGqOgIvt3esMqaoNXWxxeCJ5YVrwnPMAwOKjnnfCuFvVeuH87AVOiCy+w5z6dop5JCGb6QBkfForALC4qA6xRpaIryxcV+GrxysILMMNlXKZvGGcsCz7iGcRQj6HTvBf0ZsfE0KPaZRCQc3gxC41E6cd1qfJ8cI3uQsB7DLF3YSnMGwKNgtvexjRcPOBR3csKcZc/AM6crcTKXyAQbD5mS8efldu79ch0zJEm1pNwjqBYZRyK7+CmpBOiykNNY7LnPHhsGRT6o/3YjGN1qmF8Q51lmMF4V59sYf6HfXa2EQUvMzBeYqGpBbd9khYovbbQsRWTvChdsiQKraHLUkTZylI6iE755dHXAPu1iW1ZjJ1/O123wYVthDdgwbXG8w9NKcf2lPjQUog= X-MS-TrafficTypeDiagnostic: VI1PR03MB4703:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rVaATMqIe7yJiO5yUCRUJtewlxE2DNZ8XZpdEjUqBzUbn75o7V5ee5GyZH2oEN9+rbZQ5fCZS24Nve5w2z68jvSR/lgrETj2ZeH6KmLO+1eyyF10nQ9F9+SOUWNqRWh7tVRRBs7abaSa5UGoAeWy06OnOFr0x8q3GOQdcPGA7u6VwOpdOD7Q6+QkAnHJQqQ8y16kUpZ9Gp8eAnSGYAA7Y7M4u40t9Vo0cSRbzn1f17jCYlFWnb/HDFZoWKqkiRKqYIH5yQjRZSahyGPAgD4ze5AU3T3csmTNQz96x2gqA0Zi69pZgvZ7jAevaXYPdd+wgh1n8Z7153ED1esXcqP8Lsi92duCO23uhPQqVFMVtnKk/d/Zqr/EE0k3A6PUZnap2sW2zEOpNJzGlFgqC28602l87ggLFWwgmC7QvnHxVoz90NYmb4L0PoP271DRr/ci5vikMxN4Z/9mSETfnRFx5B3KdtrlX4GxhLaxPkjSdcs9f9Rv/Px3SIDZgJsxkpFiWxUeL566fI3bCTtrPHq1dFSda0qUptUtKoN+sgmLSM7PIE6DcmlcxprswzxXzQQpgMKrz4SEsLtVgk5ILJj2Bw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /tAl/XMMaPRwDyBt6XZEUfsjxknabBOVuLFduaYBgyPdbHcWUhqxl+vcIYPZ/I/YN3mgekqI4PwuGYT3mbTqW9CmAHCncMSXtPEyRgIxdtaHXoZ/eUXHc0TtHEUaNYDQJx30E4kmPWxrSjC05UWiyyfejT6M9lccHWwy4QGCfvSho/sVukRVhBy9o6fpqbkJplbrN9vHPHxc5FmRHQTuEAmpEgFZGpeubWz8KNr7HCnx0sy+tsNpIfa4w9TJ/1EnXO2YvbVlGEu97DTGU9psskVy1+CesE5sCeoIqgsitfGPGi349QJ45gWz1x9vcGlym+GonQW+S8Qi3G1vEBZOZ3i8l17zM0LgJju2RFAac1axOmHcjWpp4kCf1Y4y6Qtd/xoqpoP411T97EJDMWWVv4CUPGF/rSDiWZi/ixHpkxbxLsYhwpk1luRvJgePgAB1ztlCYYA1J/O+tomAe1Op7P4NXeGhaQB2FcN9jupLYyN5B2u9FMlaOfij3BZQgCB9lxQ4PJHz1YCAanD2HdfdwTuf8Ocsp0pn9d//S+07e5tdfnqpEeW7EBjqyGhgwMVUpdRD0d/E2YjQgeo3qpu5IycB/ex1NXkGp+irqlWcKB6zF1QtGmcExvrPrV8yowAwDmhXgPuKLOtgTswp+QLinIf2ZvIsA8Mwq9+7SaxFbelNpBQNu77g1V5/8DGQICpK6ygX1FX2/LGiR+8EPvDdxV5Ppa60S0qkVyi3JMfcxQgSudBauIhlSc/pJ3Wn6b8ALiM3XmhMGpmVGHeVrtVxr34JHHi5lgt4SMiA5hWAtu5SqZYV+1+KBITeZD1E4rWXnzgAkNdj3WDzBnzxqxyNDk7F0R9CB7raLHsOdaB5/i9/00cwdff+hzbdHAZHJ5w/wjnAsyOdonp13aw/q4Kph7Ge1LWbv2wl9gnm84HgjHLW8n8utntCsTnnLW4sN96OaIMpv5aBiFBjSo1nKsonig== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c8a7e3de-0b67-4150-d15d-08d9e7f16552 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2022 15:17:02.4883 (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: VI1PR03MB4703 Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/cbs_mpeg2: Use smaller scope for variables 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: XBIJRMmYioZI Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_mpeg2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index 8d45d1ceeb..dfea12ef1b 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -144,10 +144,8 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx, CodedBitstreamFragment *frag, int header) { - const uint8_t *start, *end; - CodedBitstreamUnitType unit_type; + const uint8_t *start; uint32_t start_code = -1; - size_t unit_size; int err; start = avpriv_find_start_code(frag->data, frag->data + frag->data_size, @@ -158,7 +156,9 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx, } do { - unit_type = start_code & 0xff; + CodedBitstreamUnitType unit_type = start_code & 0xff; + const uint8_t *end; + size_t unit_size; // Reset start_code to ensure that avpriv_find_start_code() // really reads a new start code and does not reuse the old