From patchwork Fri Oct 1 21:08:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30875 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2088940iob; Fri, 1 Oct 2021 14:10:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHGNQDgoYmOg5ruQ0w9K2bz6A1a9qC8NDpNTmR30KJBB3Z4KUT87k2PHRMLr8eL+OTSBe1 X-Received: by 2002:a17:906:29d0:: with SMTP id y16mr89685eje.477.1633122634955; Fri, 01 Oct 2021 14:10:34 -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 w8si10909792ede.307.2021.10.01.14.10.34; Fri, 01 Oct 2021 14:10:34 -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=pd59rfbn; 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 5F8F868A99E; Sat, 2 Oct 2021 00:09:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2028.outbound.protection.outlook.com [40.92.90.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2373068A958 for ; Sat, 2 Oct 2021 00:09:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AQGmQ8PmwkHsYmINfWEeXTo1CXjkga2ln9G772unEWUH7KUjQAHS6pF5VXM1LLyKNmkRLkj1yQRH3sMbECBilFKiydyOAHN7AhUQnLLSu10F385yA+mmGzrU/44obhPAewPzWCdJsHr0H5+LQK0Uh1wzr5m96BxyHnxiafG2GJhf4DuHJQ+JY/3Qihb/cDgNy2BBu1GgLmjmBG8Hexhwtwm4k833JcyHUCoZqtYVfho4reH/3LmmKgNhKBCVZKrgXw357GyR0kSYGwV80QWEuR7rxro1C+fR++NJyJbH6b+tWRhPiSz3dO1R9QdldQO8YdzpzBq8mY/IAbmgv/q40g== 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=DN5V2IIbNqmezEEZTFm+k+zstgGxzJ8Cp1OaNHFjw9s=; b=MvaKpTJFdQo+FzMmg7ZoaM0emofDz/anXEfQCF8OHSGzES1F0qS/jLTYaNa4w+mOn2ubITUIWSU6ZbdrnX8SawDMYtD+jkgu14hv67xlMIVFec6/n/pJ1laM6cgn//ZBfHbdC07bqXPXxbt85oogMxJasXcsjsz0Ca0HDXJpSsvyKT/yk+cEUnNlVtRj8Dw5OURG0Uet94JN3t1vLbNyzqs1E1iJoQ3BxaMQtf7GP+ym4noVUprdlBCQ4oFQHAmEqLqZt1mR2VAt3XPHU1LSyueTzFDUWH9lcunRmtMiVIkqMXBKwkKS/FV9ai/QO7Fp9NhFKiCdec40uTAWgdil6A== 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=DN5V2IIbNqmezEEZTFm+k+zstgGxzJ8Cp1OaNHFjw9s=; b=pd59rfbnaXak+gCXtH/O6v81tv4n0DSqrOF4XHRtbFgayOZhbiahLSw5YzdvlA4TfFHwhV7N9X/TWQfkA7YRXaw6bFfPrXnB9qF6m+BrPGdx6B+avEPYQsDzGQWAezgqtXmUFvVMno/qy800bqDzyEs4J++MS2oqadP5grUtGQtwHMwdeBagkq+1gn841HevJB2a3LdVb4jcrnQFtAqRJd5g9ULdMPwLCTjWsofIqzjOY9GP/4wp9h92+WWpYrq1WSP6HTOf6JPoODvwJQV6GDRgHrivaGSvKEI6Lx2DC8BoJxz0C5z/NlysVpq1kGFP2TGfu/s836CpZ6LP64mgFQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6952.eurprd03.prod.outlook.com (2603:10a6:20b:29a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Fri, 1 Oct 2021 21:09:34 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Fri, 1 Oct 2021 21:09:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Oct 2021 23:08:27 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [aD8YYII4T7q8/ZsVUnBf4ljR7XukcEgC] X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211001210837.2879205-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Fri, 1 Oct 2021 21:09:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 84e8d459-fa41-4760-5d1e-08d9851fc487 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL387mJJPv+D1gZZJNbM3QQmcwZinFrfG33M+qMCk0kTvrkYMJ/0PDR3UTJqhU4Ihvyu+h1hbnOrX0PBKe1+oqG3Wt175JuwYI50h7rF8/2ngfBE4SlPnOzFaXYo+RsYaUCuC/Mb29Fx70gU3P4FXTekdR04JCl39okv1xWlYcyjgQ261H+HRBb/rSNoKms6Bwwa97lfsQ7veWQdxDk/FGepcF40247z7wRD41IrYcrzefGTAw5QCY52C8OoVjON8zbAWdG4CQ9U9B12Yi9+uUZdY+/BvPB2252YyRSf2LLOectuxlWOe0Vx8ZP6+BkQMzO9rShqeTnlFsUTyS5qGDFwlZtDHeCc+DOeuxgzlhOcAu9JjruPiHFdNYhcCBVwOt9GQXPWz+x2KFA0c9QH0ytznD4zqrrJwKwWVoVtSs9YysQxV+Hj/gTpDwVLsyQtPi0L0NFlbEeHgfvMrgqBSLfLg4LafnaVDAIW3mZc4vtJiAKWzQhps4pHqZjOw0yR/+05iNZ/x4LgU7uwRGzHp5lFlmdXpQGQIsQnDPxrHoqXUJw2xlniRnAEiiha658asJgRxfmeHEHq7fr63mGfJhAkkFo3NrXqF0465rgCQYPJShP2YuwMkOBc/I9vb1POYUMTz1Nvjl7DF8Y4QDKvrS5vrYEVHIj9sl8fhu9kli90NtUWqYPt6Sw34bpnHH+G13k+ilGvRUnmQ== X-MS-TrafficTypeDiagnostic: AS8PR03MB6952: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /l1AECefoiduFDs4rAcB9yTyWqQjZlQIxAAuqEfUJB+ATWma5HFud9INW7Kg8+vDMlbzjAR1qrRoMfAgo05dhMfJrJkQxWDE4MM6vWQBrVqdsnFrQxyn+Oyx1nm0IJebJWs22FQ1kU5zRsCQBdHxfja8/qhh3OPSPWoQVDDnEgNg3BtseRXLvnVl115EBdpJbmONwx2fPGybS/JJ0933PhPgXDWomoeqm7JVLq/5kkS/kPy377grn0EfI9TqWImpGrRtyVNvJaRfqF3Tb3nsfWpSJOg8HLZhBf8FFKhf6RNf+DqAnNk9YDPlbdrT0UyrBSVkPAdc0LOY5sslVhCiY3DhvSAj8+nFQC19lR42KKcJf3JxAUEGUiw4pprfy9A/hRhHwDxx4DKgiLraYI0c/+AqoRQgkwLUo1WB4oYar0KHWiukj41GjUhEBFMkafY5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xQryeiv2KliB4qMB/oeSrNr/NS/+qK+1k6+u7HX6VVjaJtZdD211AetWJqnUWn4+idF3z3cWzNiqUJSadm6KiSDkjR+Krr44l+k8claTkVJSsfJi708Sfkw2+UQIgKQNFUBOPTvXiVN5EAPL4iAutg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84e8d459-fa41-4760-5d1e-08d9851fc487 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2021 21:09:33.9512 (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: AS8PR03MB6952 Subject: [FFmpeg-devel] [PATCH 10/20] avformat/sccdec: Avoid zero-terminating unnecessarily 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: Kqcmzp7UgzmO ff_subtitles_queue_insert() does not require its events to be zero-terminated as it has a parameter for the length. Signed-off-by: Andreas Rheinhardt --- libavformat/sccdec.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavformat/sccdec.c b/libavformat/sccdec.c index ea9f014cf2..6935ea4c3e 100644 --- a/libavformat/sccdec.c +++ b/libavformat/sccdec.c @@ -117,8 +117,6 @@ static int scc_read_header(AVFormatContext *s) if (i > 12 && o1 == 0x94 && o2 == 0x20 && saveptr && (av_strncasecmp(saveptr, "942f", 4) && !av_strncasecmp(saveptr, "942c", 4))) { - out[i] = 0; - sub = ff_subtitles_queue_insert(&scc->q, out, i, 0); if (!sub) return AVERROR(ENOMEM); @@ -136,8 +134,6 @@ static int scc_read_header(AVFormatContext *s) out[i+2] = o2; } - out[i] = 0; - sub = ff_subtitles_queue_insert(&scc->q, out, i, 0); if (!sub) return AVERROR(ENOMEM);