From patchwork Mon Aug 23 13:13:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29740 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2081732iov; Mon, 23 Aug 2021 06:29:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyTktq3CWuuN6ELFClsiuFhqeS5EQCkFF10FwNYVz36WT/x4mWfs8YdkwGf/FvUIRHboDRY X-Received: by 2002:a17:906:660b:: with SMTP id b11mr13771375ejp.427.1629725387266; Mon, 23 Aug 2021 06:29:47 -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 v4si8656864edq.468.2021.08.23.06.29.42; Mon, 23 Aug 2021 06:29:47 -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=IJ498fCb; 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 705A46808A7; Mon, 23 Aug 2021 16:29:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (unknown [40.92.71.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B392668A40E for ; Mon, 23 Aug 2021 16:29:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oSBmnzAa5qkk3pVYlPty+GAGfMPUR9Y1Mc750ggsSL9SH3SxnohbJNm7xt642jXYBZtP/34ZTbLA8ZOYiNIMpLABBR1HtYyeCfE04LAbwvmGDS+pgbHd8VWqzlrdFJvQO1zx424LTfEvQ1zAGqB54cJ3rC3ARv9H6U2RZuuN2P4fpALv2Ae4K/ciWuT+ToCDnPmlbpK6d3YnPoFT7Alln2l6uHcDaweQPw4rL5/oiULH8wlFZkIMNVV8Dyu/5Anu9SXBpDTeHRuYb4DubFNVVeHtCNh1sclwI77BsZNOpwR68KAeQxS8bkF6Uc2Nl1T2KphLYBWd4YhDlBMe2HXyaQ== 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-SenderADCheck; bh=lgeLwAv52Q8JctlV/vDA1fUKBlVewMDVz9iWER21jDE=; b=HXPiot9hBOt7cdno4RMI41F1zcq6XJ678DVCr//39ASNDFLEH/6w/EVljPOWDlyhR5qy3TuhhSQnoVNGTLIQNoT1sfAXy4vsiTTz991WrthqL/wF4+opRbcKlN5/msauDmHoBWYws1OM9g2NJytTg1u5ns4RxhYL6U0FVZORlbtw2eq5qAx1pc1zQ2YisYy197W4KguCCMkABf9/2vmAVCxLEa8UAFzKYUS9K6x3LsZbNSqulX2A1S04MFGvStsMd2Yk1R97XgvuxcBZNe5QCW2vcgmRhSrwjZUt8NFDY+rQoYFw+1NarIDWtqqig+uascJmQFZMm1ry+UaqLhrC9Q== 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=lgeLwAv52Q8JctlV/vDA1fUKBlVewMDVz9iWER21jDE=; b=IJ498fCbtZAzS8lT9YI59g+KEZTJFzTajGFiPBCdAY7HgF5+pJYuHFZTAaeUbyaIpK++3lONyz3nKkWsLutKiAt2hCgAusGzb1lt6tM0T/PvrGe9IKHO/XROs/hOGy0o+miK9FUcAAKQNxYrif065Qz4Oy8jGrmAxFZ+ODcPRQhKhhgl2RMPetLqNE4CNYjURAJwlxaQZciMCz7sRKdKiuUd47wq9rxNqgwLhYdvQCQOW02R2I4aYIQSDFWEpxRb9W/fpvph9y9xf6DkDtBcEbPurQeJXGwxgnNIioIio51B+NW/Ip9QFlMhcjUBVtUGuVheSvH3kLzjavbsIOm5CQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7351.eurprd03.prod.outlook.com (2603:10a6:20b:2eb::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.22; Mon, 23 Aug 2021 13:13:43 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590%5]) with mapi id 15.20.4436.024; Mon, 23 Aug 2021 13:13:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Aug 2021 15:13:29 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [GABTQ6q9RtMtUaQXSxZtS4xIuuzHuRym] X-ClientProxiedBy: AM0P190CA0029.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::39) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210823131336.1837749-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0P190CA0029.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19 via Frontend Transport; Mon, 23 Aug 2021 13:13:43 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6108889a-f966-4e58-175d-08d96637d52d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS/C4aPjcJNMjwSEMtUFABSi6AhZBpTg3RvaJUdVlLWtDP4MAXPc1F1vTg+QT6A0nkm/tYf3nF1UD/MEx9vYcUhtgjr2cfUmlnS9HXSO6q1qq2iS+et9Sh+oAvwhtGVJ88l0pxyCX9bxapsY8MVnBQkezuBh/y4ivyazuMkQVyVUoRbEV3OUDyogy17pGvm3zzvcvSNw4/x9uQo4X172ruPNOl9yibB8feywxPteRx8wojhaTE+kwYvZXzVdTrKR01oX/j+r81EhoBKfNfsGxwBEJWXWGIZUUZQFXX5uZsEUL28jEKhYKXf3MYR8RPo3y3GVUAmQI/7lmoYFaBtgjVtbzNiJdTQ8EdIqLkiCgAYu9L+PVMfs/ZSHgvioWE3nITJXyTk330HzewgXIsV4faitdpY/aM/4G/9lpZ2f058INHYcVYxB4IJWRKPj1T6ozK5xzW6uj9e+dhilPD0dkX7yoEOBD2zl9P2gTZMuqATg8rMvr/pEvsW9Uc6HCVHd+y/wqI79ChyFBA5S0AZ1PUj+w2N2jEArHwfB9DrVLceOS3n2a9L6HfVRh+AXYQ/QYt9ISijOnD8BGhi2srbh88FkvaiMxt9vgbdt99Aujzd37tUzWd+nMXKReDhSY3I1JMS5N/hqC5YQgmhfTs7shWkZCGuaNH4sQCWVZgSOZQvFG5B59B97Y0quPgr/8E7ZjMgQegQJyBFhsU8qQVVIQx1mcPEqyVqxuMUSpTdQx1wSpOiU09afj8rRLnucWNitMA= X-MS-TrafficTypeDiagnostic: AS8PR03MB7351: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i0DzFepcDOM1kKYjzDSaKqju2+0Vm/yiJNLO+0MjHE597up7NUefz1F3Xoep9MorU5SABZunvVqGPH8sIfnv+qQ25QwtO3BGY71dPC9LpaOmtz/rOseMNdQ+Yh2Mx+IBToIy5o9EWxYlrKXvp/ko0pCUIp8nfI6PDbqLhW9murNuapr/QbAcr+4fH3Q9t+bEj/4EiYZ2ViyuLxjAyD+r91Pe6iADKMeG8MYvN4TvsMMEOrTTwcIm1TaYEGbekva5c+CD9Zv/hWwCqh62UaPbVsT1xGDYNmQ9PxcoPWmedP4HeEQkaCBcrUH7qhivccin3c2h7rGfF5gM/NOfdxVgyYbXfgCXl0kogq6zx2vCxxso+GKbKHobUOGju2b+dvU79MFiMPao6F/kpXPWuC6zHzqp76WPT0vT/nNGqxoSBDQAEyg92rwUoiaO5tTPpb79 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9foJxriDEru5CPMWb4rwYcQ5kTqevjrEkRxjzi5UbSYdFYwwiNRqml2wQ95hBcBM7uiCy5KaWvoKySnITZBEbJAY/y2jku7smVCrfZyNmulwLtX/gv6ip/Brd3JRq1t/OAqrVDmo1xxc2w4gIe2Abg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6108889a-f966-4e58-175d-08d96637d52d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2021 13:13:43.8916 (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: AS8PR03MB7351 Subject: [FFmpeg-devel] [PATCH 1/8] avformat/vorbiscomment: Don't compute strlen twice 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: +UH9JKOahrN0 Signed-off-by: Andreas Rheinhardt --- libavformat/vorbiscomment.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/vorbiscomment.c b/libavformat/vorbiscomment.c index a929634cc0..13ee065a44 100644 --- a/libavformat/vorbiscomment.c +++ b/libavformat/vorbiscomment.c @@ -66,9 +66,10 @@ int ff_vorbiscomment_write(AVIOContext *pb, const AVDictionary *m, const char *vendor_string, AVChapter **chapters, unsigned int nb_chapters) { + size_t vendor_string_length = strlen(vendor_string); int cm_count = 0; - avio_wl32(pb, strlen(vendor_string)); - avio_write(pb, vendor_string, strlen(vendor_string)); + avio_wl32(pb, vendor_string_length); + avio_write(pb, vendor_string, vendor_string_length); if (chapters && nb_chapters) { for (int i = 0; i < nb_chapters; i++) { cm_count += av_dict_count(chapters[i]->metadata) + 1;