From patchwork Thu Feb 8 15:08:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46110 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:a586:b0:19e:8a94:b663 with SMTP id gd6csp325080pzc; Thu, 8 Feb 2024 07:07:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IFIigO10hT8Z83p+gSrmIDS12L8WYHBjK8rxAZFaIuZoCf/nFcG2W41avPmhMCUCFj55oiu X-Received: by 2002:a17:906:694f:b0:a37:7e9b:fb74 with SMTP id c15-20020a170906694f00b00a377e9bfb74mr6995552ejs.73.1707404832918; Thu, 08 Feb 2024 07:07:12 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWoNPwA3LQ4LtDSQsyvU+VAw5ex7YHdL37mbfvwa2HCbQrs+tA6yb8UDG0IQVRlvn/3ayCbGSQTEZgEZPxIt591wz6Areve3J19tV4CBlhigcMG9upxJbhxujMDs7pMn1NGYmArPSGyCZWNiI3QKvvEtQJDtCpnNhvUc1N5vmXomgXCwtC8aeIc+rUVrJQJm8uJ2Z4Z3XOF3LAqBYwCD3VDqOObsDePtVFrP1BHi6oTT0Zn3ON84kogZZBdiKGz5Bje5QO7ASiGzL9VBO+DJ8UpmwKvyPhMVt10MsXeUoktuZosom7hTRVHtc6hnhkrf+da3n/xD6P7Wv9LXWBJNN9KIdyXmiYn5kTWdj60FiPpWMCUv095rmjMmTdOs16EYN01TBqNBiQ0ZQ5ocEq1gb0gvjPrB6/h2Xh5OJ9NLHIBGyJAQo3sERUrQAiIqrgoZdzKO8e5BzGntXktSc+/ZCFEIIJl6DZKCOoKBiIO1NPGeDXs0sAcWssjQALJT+i5Pg/at/bP+GRJEcUBjqlkeEVvD/dQsYjzVVSN3cWRyiouNGJRdiQgVh02xcu7HivAVPbaCREwAf7NpHVGSp0yutKBNXfXrsh0jGpdROUetI0UKuBkBMwuv2z10tzbTdNn/wC8z1N2innaZK/LckIbEkyo4faYYn2GWf3B8oprYnlIODyqabIu/VYFFfk79ekI30MoUSUADQ76QEQK/R192NUpAxrXhge6Jgb+ZUURoTxOfCuUQFiq5ngt95kgiZ+YjHa4oKCXZgXFYQrUH1RlgNjSsWCmNNOu8F6pQy5gmFYK+mm2bKsDlU9nLZl9q57zbhdW3I9ZmxWFwcDC35mj9MF4DQG8+C6qAv8FbfV4Hxnqvh1oH7DYipZqIs2MrG6yLf/4eesYENc9Rs3URr9BuAY4BWwBQuPoEsulf/MIfrRB2D9DU5lIzOzS+TxloPzHSfdEPx Nc9QdWI5jkcfLsg8UVWk6txRsMAp9HsgDtko9yYHfmSwH42QKp/P1mt4FWqsE5JqIj0eQ2vosUxuU3nIVqlYu5SwtrjHQawrDHLaNYv5l9tw2+1i4I2Vx72TJSiSp+2Ui+7U1ujyk4MJyQZP8o7YqTkKmXxOs8MP+S22NAZs/uYy90gdY7sq7NXnTXIr8D13KLWO3BJdJY6DqkKLRBDrNh/S+6cB/L9ohdM+clm/yg+UWZExP3E3F1F62+nGwrc6MwMIw6400d5opZuFzY7Awn+yPWTbbEXcbp90VLzZq2oj7qs9ej0dhgJhjyAqfD4r1a3OPNZzpFwfvmYKMj+KGr0CAd8HQ0HZb9XVklhtnaIvOLL2561tgJ/XkSjKC60l+n9b86ll74nTCvhzaefQtMyRh6AEWy16rYlLJLG8F9FHc7GOf6dk5Mkg2GKXBlSEunFRb0CYF3FciwE/Hu/ZNYmLD5N6rren3ELBhTlqoTD5kkqNxWNkCoBLEs4JnANWU0cADVUSjxhXG4G1C+ckje6/kAUlkeximhRc2Kj2R1bY1bYIgXkBB/CXjkvaBbUq4k/08U9hHpo6De1qXK7vJUGULNSQV3GuT12oNeU60s7IMmqKC7IgWLmC0/7bfOImnL Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i26-20020a1709064eda00b00a381b5eb48asi123752ejv.672.2024.02.08.07.07.11; Thu, 08 Feb 2024 07:07:12 -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=IaBrP647; 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 3040368D145; Thu, 8 Feb 2024 17:07:08 +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-vi1eur05olkn2052.outbound.protection.outlook.com [40.92.90.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1834968CAAB for ; Thu, 8 Feb 2024 17:07:02 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VS0HY4JWKr4kNJItUWWrFQv0+/Uok2mGnNwfC/Sk94FrOmcpWhebFJsQ9ezLHnoVbVrqAMmzRd6oiEme7jWdiruQ9sN8tTuozpu/84pDkrHin5NjtUqa/lu6RmeNCmDGkvmKrIJxFxR0ff3NWGrDrZOhgigcVN01gr5kba9mzwlJADOQhXsPdsU+CazDlLAxfsrjiUUj4tqtBh6syYRBmXXv54erg2YPcZTZ6hgNFBt3RQgvSpPednwANi4Kd4oi+Pv9gcgz91aWjw1bbToDggrjI5HnUSo5F05m2eGFObRRI2HSfkxVLZuYcXf792kH4OkR6SCaGxU1QWpwqbgsug== 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=NjlXjSyTHZs0e6WODufi8L0fyTP9a+1PGyEWO4i+E+8=; b=XzIxI0HmvK9o1ZVqhf4F2exsAkozeie/BTFQTOPEDCIE6GJKZZTscqoCRZ45W3EJu5QM1mJawbINj+YJVQbsGWpDmft97gQX8TBEkTIghAE6R2FQmulxf+bI1YAJbTVzIMZRufEDyyyOlZ9fQ3/3i3zM0AxzzSoVS724M1N/sEi2Kdk8SEmwAUIExaOJajJ4OVw226KXby9uGnxksswPSxgp4woGGB61he6Om8id8IZ+jkconpm7D+qc0Di4YneRnOdzC+SNG2hH5SzfVhRcVIcR2AdFB9B93zhWLc6FW6E/bI2AhfzGShUPCCUQ3BGVXVabDQ6S6rEOXCjEMZ8puA== 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=NjlXjSyTHZs0e6WODufi8L0fyTP9a+1PGyEWO4i+E+8=; b=IaBrP647k3yQnC1McIuk3XbaXpE+gA6YAFZrfb/RI0iKkeGauSPe6fpI3iyo6vTZVpzTev++ucDal5UPyJcwyKEE8R+kP0XCuvKz1PJiPaAUoWNrFZuwfk6WFPcGIzfYu5cQge+vnzUfyMzPlHKDLuxT+7vFoM3zgMVs5KOnVYyFGvIAjzlwyk/pw3amhgnn5bcA8h5s83SV4l+sTJZYvVA1pwGFGLDDI2dsAoYCIHC9g3/uSE/HOOtRVbtIwTiLkvn2KUnOtG9maJqRV7wvVJN9zr8SeQXcqRh3P0c2B7GLqBHj8OUZMgI8vSzUcL3s1xzYzHpQ9nwXPPN2AM1zWA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0282.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:371::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.39; Thu, 8 Feb 2024 15:07:00 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7249.039; Thu, 8 Feb 2024 15:07:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Feb 2024 16:08:45 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [UqukNRyqFCRSpYWxBd5YVWiW+AqD0M22AK77IxdjdBo=] X-ClientProxiedBy: FR3P281CA0116.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a3::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240208150847.477489-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0282:EE_ X-MS-Office365-Filtering-Correlation-Id: 04ceefd2-c93a-4ea8-32cc-08dc28b79967 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZFiUsipr9cNGvrltjHgzWshTJUH1eROlIRUpUhy9QgutQYxEsKOUfyR97hEA2UEGFy577iNsy2IFMSAOCbGf/rcLu4MWgyAupIxOCzzFzWkVRJfaSkmu4jlTdVLoa9Du2TX9hQnVX2Rasn2trQ8Tu1QtjIpnXBMgsfGSVTbNEKM4tOVgU6YOGDvtBfZtCx13dCzfW4B0Yz9Dt8pCiRJc1M9yHUIAJjSDTDx6BewWpXxjpVyzgJd/phBAHQM5GxzQftgm0DxWQ3w5xfd4lEVOHlCuAdDq0DPulOkWA/xSd81CaFGutjYdHTAlH8uyv5fcnbA12qdl11/WsiaOXcOCDjLDI7iv3xYWDsAVqIDLjel9ciFeftJEokgA1tnYPXHI71MVjhJkKBePpZUl8kAOoasfplfkgVBGUx+OJLsBDVhTSz8EF5ZxSV9I4RIjGm8cHF8RJqQG9b9eZrGoY6x7YU/05L9FQLKSXfPCO2OPHha52jITC3Cg1Pbdnlx2BanUJ0r7qUOTQKQ1IMDTH1XljnvB5Ixac5vV1L6d42/Og5X95IUngMHlgbYfmcA4Z0lrhtHQQta3PyJnCyWZm4OmHc3Lu51lem5OW4RASk1EseJ+33+53/qU8mHGNSk2yBjz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: j6kDeTKXSuhH8Xk/+HZF+YCozEJoY+QUtjPsaDiLsaqor5PmaUgoy/yL0r54CMbciQ0OcMsmEjIksL4DWQTlIFi9/cVNUe+AMMZPW9fdtAWkJN9xB/cAGnEqjGvdv5uYzZ0fYxmtItcut4ZPk1JBAeqJTkSoh5538zpfhvDTdUij01v+eB0hxZDglYS/Ww8xDb/1DxuequUPbaYgwPJAhOqNsE4lnpWJD117xAtluP3Wgd8Xh+GFO7mqSEGmmaM44USyF3XjZh4oE6/TaZSu43gkErYCn7AFxUkZB4eOav042t2ZufLfKsTu02WGMau2743+l9l2q6tvDL/qIPLNiIqmNK65rTN7mB1+0CYJ8FbFLJL+OsOvAQO+Wh+6d43pqYbJrkSHBBI5Hi7WkALO1GISITDjM7PoaPAHqill8RKwb0s/2kXZ+md99/yCIodhApuZiQupxRn7omm3cEqF/MwzHnXDzRvQDRMLNffmlFqQ0iRxjzzFaywUt7oNyOHDnQbQnULYwVa7h584wGIdGY7crX/0EFaibc/bELQSZprFhuf/CiK6xIj2pf07yffLx6nL4aSevgNpOACY9Zj+u3z+MkzF/GfvW+MiRP/GAPSXSdsMqshr7dQQdDadtlm7wavCRERhcpLKOrBRwwC4CrUm3kvW/nZArNy1yb1P2vNqiX30BWNWc/hc7c5AcakW91hYcquoGNdN1fLmK57l4DKGyB5fyZBI/AT5lb7nRUaxozwrlXwfX5En+4cW0hKxf5QSL1euanfkaqnu1N0ey7vQdZm6wVRI4oPpmgqgDqMKTzwuQ007V6NPIlEFXQ74j5c5Xu8TRG2zHgDVg107eUOckOlhKnPmh0CcSNKuZ+DoD25AO+wrcjzytFnXu8pMmlWuYDdLprhhx5K+MavevoIID+8awLo12ZiXExwkIzmUEonagvcV942AoJsMi1sG2L+UX1LruVSwrwUtHSAgb0H3mrhu+w53lu7EE5YUl+60pNt/BghyF/ayjAtMlelsU5TErpDbfmCudRi1k1w1177MvWInF8UB3vWxCppKw4myv0D8vyLr/SsXOa5FE3cRsm1FyVWoOWhrqPrMmx+fAbf75L6iGY7YOp4ea7npK6daPG60Ch4LKNkSqOYNe74uVHjJ2ppYn6XMT49OXLfnGSYJdgcPNE+AnComrzgkINjT8Ux1cDsspRkQPHG0zIDTwwgj6gjTsyqDQqenqVnROlUOzZPC3UsWTBAwFkwY+RXVGtOQzwYc92UoPttxERdS X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04ceefd2-c93a-4ea8-32cc-08dc28b79967 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2024 15:07:00.2349 (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: AS8P250MB0282 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/rcwtenc: Fix potential out-of-bounds write 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: KZLX5UL46M4C The rcwt muxer uses several counters for how much data it has already cached: One byte counter and one counter for how many complete blocks (of three bytes each). These counters can become inconsistent when the muxer is fed incomplete blocks as the muxer presumes that it is about to write a new block at the start of each write_packet call. E.g. sending 65535*3+1 1-byte packets (with data[0] e.g. 0x03) will trigger an out-of-bounds write. This patch fixes this by processing the data in complete blocks only. This also allows to simplify the code, e.g. to remove one of the counters. Signed-off-by: Andreas Rheinhardt --- libavformat/rcwtenc.c | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/libavformat/rcwtenc.c b/libavformat/rcwtenc.c index 839436ce84..d0e469ce65 100644 --- a/libavformat/rcwtenc.c +++ b/libavformat/rcwtenc.c @@ -65,7 +65,6 @@ #define RCWT_BLOCK_SIZE 3 typedef struct RCWTContext { - int cluster_nb_blocks; int cluster_pos; int64_t cluster_pts; uint8_t cluster_buf[RCWT_CLUSTER_MAX_BLOCKS * RCWT_BLOCK_SIZE]; @@ -75,7 +74,6 @@ static void rcwt_init_cluster(AVFormatContext *avf) { RCWTContext *rcwt = avf->priv_data; - rcwt->cluster_nb_blocks = 0; rcwt->cluster_pos = 0; rcwt->cluster_pts = AV_NOPTS_VALUE; memset(rcwt->cluster_buf, 0, sizeof(rcwt->cluster_buf)); @@ -85,10 +83,10 @@ static void rcwt_flush_cluster(AVFormatContext *avf) { RCWTContext *rcwt = avf->priv_data; - if (rcwt->cluster_nb_blocks > 0) { + if (rcwt->cluster_pos > 0) { avio_wl64(avf->pb, rcwt->cluster_pts); - avio_wl16(avf->pb, rcwt->cluster_nb_blocks); - avio_write(avf->pb, rcwt->cluster_buf, (rcwt->cluster_nb_blocks * RCWT_BLOCK_SIZE)); + avio_wl16(avf->pb, rcwt->cluster_pos / 3); + avio_write(avf->pb, rcwt->cluster_buf, rcwt->cluster_pos); } rcwt_init_cluster(avf); @@ -129,10 +127,7 @@ static int rcwt_write_packet(AVFormatContext *avf, AVPacket *pkt) { RCWTContext *rcwt = avf->priv_data; - int in_block = 0; - int nb_block_bytes = 0; - - if (pkt->size == 0) + if (pkt->size <= 2) return 0; /* new PTS, new cluster */ @@ -146,11 +141,11 @@ static int rcwt_write_packet(AVFormatContext *avf, AVPacket *pkt) return 0; } - for (int i = 0; i < pkt->size; i++) { + for (int i = 0; i < pkt->size - 2;) { uint8_t cc_valid; uint8_t cc_type; - if (rcwt->cluster_nb_blocks == RCWT_CLUSTER_MAX_BLOCKS) { + if (rcwt->cluster_pos == RCWT_CLUSTER_MAX_BLOCKS * RCWT_BLOCK_SIZE) { av_log(avf, AV_LOG_WARNING, "Starting new cluster due to size\n"); rcwt_flush_cluster(avf); } @@ -158,25 +153,14 @@ static int rcwt_write_packet(AVFormatContext *avf, AVPacket *pkt) cc_valid = (pkt->data[i] & 0x04) >> 2; cc_type = pkt->data[i] & 0x03; - if (!in_block && !(cc_valid || cc_type == 3)) - continue; - - memcpy(&rcwt->cluster_buf[rcwt->cluster_pos], &pkt->data[i], 1); - rcwt->cluster_pos++; - - if (!in_block) { - in_block = 1; - nb_block_bytes = 1; + if (!(cc_valid || cc_type == 3)) { + i++; continue; } - nb_block_bytes++; - - if (nb_block_bytes == RCWT_BLOCK_SIZE) { - in_block = 0; - nb_block_bytes = 0; - rcwt->cluster_nb_blocks++; - } + memcpy(&rcwt->cluster_buf[rcwt->cluster_pos], &pkt->data[i], 3); + rcwt->cluster_pos += 3; + i += 3; } return 0; From patchwork Thu Feb 8 15:09:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46111 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:a586:b0:19e:8a94:b663 with SMTP id gd6csp326171pzc; Thu, 8 Feb 2024 07:08:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IHCnMB3blEZm/3KUSVQ4Pdgsg92Y5W0wO+V79sL4N1f33Ty+Z7r2F32tLSw2Km2PQL/uD53 X-Received: by 2002:a50:9fad:0:b0:561:1e1d:a460 with SMTP id c42-20020a509fad000000b005611e1da460mr604869edf.1.1707404899647; Thu, 08 Feb 2024 07:08:19 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXJrGBhf/6EtPGiRoAvqUlQB9BObG8oS7BtROAejaNMQUfvW0hPYhpWlIcUh1T2IAF/J3bUVNTc8AGq6yRqSgVhcHAySR3LIMb9XsFwJDnmRp2vqX35Tjpve1ax1pHoYctpLbpizbeKshv4qbR5z0KOoWK+9Gz93MoIpysnD2IMJFUJipCgIljbsMgWZwlgoa6/0sKqHlQNtFimnqhNeRAQ1wcEQdxSU3t79KxWemwOp+efXMGZ37PovBhtHhNTfvnqAd/rE3foiHk/N0Wixy5U0lNbdZzXhUMclDs2CPoKqsvR2ijnZgy2MDrdOWklsB8C5+6A/wkRCgQBun/7y9l/FA7IIcg5K5apCCFV/b+EA2Rfmj8FFQHjB4Bf+H4jPRp8Lsxq9xsKuvsrEUh2uzbjGc9keRhlK5rCjYorbb+3sbypzJNics/ZphbV5BMb8Al7ikK1PiqUPhIURDo5QmaLcQJ2HQcgYdK4pOHnhxnFoD0cFljEHCOFudal1p/q/A5Y/tH5pS6fElXFBOMWhT8nFY9tA8iY5Myzlu56PpNIxtN3k0StMKFXUbYWbJ2ziZMDLD7UXnoYDR7f5RrxcIbzR37zKWoU+VFK2+fwHpc1671usj5Ru9BoBmpTkFLo589M381EBv+TqvSllkm27NYdH8woeOTYJDvu/nnVS2g3mLyi1kDg6DrOe72P6lVBQQGh9vJVlB3KPUuYuP85JIwgLkWjtKSiqX2dsywezfdDKGRbkONbNITIitj5tQe4K7/Mnv1qGrLez9REsEP1kQOOWFJPY6VAeYkev4Q0pw7z0qniSmgQ3Np+bb0m1+MyEIljie0kkGRSpZ+et+EPln4mOyhQksaDYV4x8C596x/YCD80WbhXipUnvdPJVKligK6I44APhP2eT5W0Obvn6y2Pn0liuyfj/FxZFL0Kpg8NSJaY3BfdQi7X7t0MyRxGEcWZps kcdoy8rKReY+29lhwVM2+jmYNgFhWEudvqz0T2VFVt9aecaobzXy1+euSEJre7tMl3kOH4by0IsqMluaSPRWfWDBBJSc7mQGYvfAkxB/J4dG8pU93H94Qag8P18ZXpQs8mIg0y7ExSIIwIv8e4S94cyehK04Z6Oby3Z6Hv2LKYjObbE5fwr0VR7CCdMkqDNwM1MounFq+cjJCmN9Q15y2Rj3vEywhlNiMH9sk846gET/HExPiohQFUpvGaWAxcXuyFiqBjuGzCRo4WrQN0BmRZ+oGQvuhFw9r8+RttUrU6vJICu7OK9pL03ntuYQdDiq92hfi8XZ5wpwoT2zAuOCi5jG4C0QdYw1mQNHpcQN39cMOgZpV0zeG81hhQ5Lu+aRMkH63GuLIhQ4ZodY1PeqA/KQBqLQ1aSsypcmffyr+d0fqWY2RL04Oku56Da+3iCM+IZ1j3+yk/dHKVQ1iW4SkjxPPc2bK6k5JDhZN4JxZVATCPDCQJYu38MGjIITCAMpYiD77rKe18PKAq4MiJ+gBvV1KnCg9JaVJxaJTtTAwDmUVkM4F4CLaeG7fDul/HNpCpwHAeS/noSpbPELJWzzei08Ib1A== Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h11-20020aa7de0b000000b0056012ce9cfcsi964090edv.560.2024.02.08.07.08.18; Thu, 08 Feb 2024 07:08:19 -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=nvI4tHf2; 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 7524568D169; Thu, 8 Feb 2024 17:08:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2021.outbound.protection.outlook.com [40.92.65.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9360168D05A for ; Thu, 8 Feb 2024 17:08:09 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hfp8CTfr/2hiZFdea+aqa6UJs4T2mzfwIDRBN2ZjUlELIjrCH82SbT/0VLFdbsHjhnMO6z5Bh3kEBNr1B41FFNetSL0pfWLYWVj7odkFIGBSRGTCaptLrO/8G/ROLE0K7+WAaLqPXBfSU7jnWb+2E7mKmi89qDpXmk3zgyu1TEkukqqbn3ab8mMlk9O1wfM/2YyAntkeAYEnI3+iuUpZBtisisFlmr8DQ6qihpBjLyU608ygwV0oSxtfiYp7c0aq6Ch9Xq2ZFcEIBa0k5v4/cn7Xg7GKXaAL23NxkE1Wnhw1X3qivtgCIL/kBjppcMDsIIWFlRopdRfMNZBYR7xt9Q== 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=aVxL+EGgvVtr4LaF0DwwkbAf6PUgbGi4nwPHL3CeJYs=; b=L5TqaBSiaYsPsZ7+tudqbkYSMHubrRghVxdG3xyO9kpeaqqPKcoaHYyJsP0XsPE8r2zs8ZLJFsVT637mBvYYmML2ZZn7SqzOO9iKspAsNyOXfSwVwKkPbT8VgH/2x4JdrMlK7NmZ73dq+hmMig5X2HDNUU2NDGMnfclxk3yIGCFLOuKLP4sgq0F+7dug0qVfzk7LfnCKPP374fvDAjWFaYhjLSskwqqW1275Pt5w4AYE7GVDSt5cgAWNhKAL9EJOdwFDUUvkGxax8RA52k9yRVcTc3vm+co717VR3zkog1ViMQaPtw8T0mxaLR1ERW5jik/dTvQvT67zQBfj1jnUIw== 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=aVxL+EGgvVtr4LaF0DwwkbAf6PUgbGi4nwPHL3CeJYs=; b=nvI4tHf2VmRHRm4jkGKxC3ApEGaXLOpcw1qV1Fzx4z2G7+onF1xOp0er7RGihMpXRIKUL2EAcrb1W4pAoxtxfFbaVt4wREObWxm9QZ+bSKGagE+Lb8UaKL/2mFRO1E9JNmYKfnui4wjAnCK/d3RhE59D8fPCXXnVkpYOdX6BYYGuAaLlWgAoil9q1kVYUHerWnfpV83qViauyKVhFc9P5Me6Kba7iRx+GXCvEKkBWcdOiO02ECZ2PmyGsEYVjWjrUWxC/BRkaGBer5EE4MNu7DsgDUfIhkpvuxbbBYGJ+t3sWTDHE54MdT+93i9XFrJJekFv/4/SenZPXqa1VkDxgQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0345.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.37; Thu, 8 Feb 2024 15:08:07 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7249.039; Thu, 8 Feb 2024 15:08:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Feb 2024 16:09:53 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Xjpt/w8wIs+MYs7cHA+hxbLbyarSKYcKzML3jtp2pUc=] X-ClientProxiedBy: FR5P281CA0014.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f2::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240208150954.477663-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0345:EE_ X-MS-Office365-Filtering-Correlation-Id: ad617a4e-05be-482f-691f-08dc28b7c13b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wASYBlaWlq7pgPtYmtEbCEVwrpXqbkepMdPGqVGfWlgXxKzFKC5F0is8OH/REYy/d4icoWS2EzsN1IxgcuEwrPCHmPC7JQgRAY44VRAOVltynQ6xNVjGwvqwRvsxJeF9w4poBxtKQBWJyNrOgn7wvsxDiK9moXijmqC+u39J2Vck2y40D+I1bvOitqhmqUmKcTXdh5NHhrixR7hRYloUIJCAF+hgNTYrlE1Tb+YP5oQV09igQ7/7oBWvYacGR+/DwQvgWFbkrSgWpqHP3MQJRTUL+XoLUsVAgSweXBw15TLTf3GjUeCVWmvliiuL1usf4PvwkfWtrLCjRyHXj86BbZJQQeAJcW9XpfXEi4IjOXko1MghVQ3579WlCwTpDPS3N/tiC8xAuiti82aHUTcasYWv8pshJEZUUbfVrK6XRLiLLYUyZJPRBYa0DtHGmPT+cwVDJzzKlucRKAqiTlFRdXN2uqO2w9jTxe23LicdsKfMkffIPqC79gCL50Cw40VeeDCuctkxLfPqDEQ04Qhg8Uurll6tR4ANElMjAabyOb0akj17p0IoYzBfNPrPIYKGwNjR1I7hTT826fDqJcx0ftIhOphnTlIrt0lorW8ZiZf3xYKgWKWO5VqaIRxppAG3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yMvtyg0Dkxf/EPFUVzfsnEXrDf3GfVWiGULcNfasIBGYZGEDsmedgfHUHbKjNHG3qO/K/6v/BYBUw8fORxqbJ+fIrVZl6HrCei6c6JhMLPMp3YymL20OR8F+i22Iq1DKJM0/pjRpBjTkAW9rHHPF2bJvfVCLJRh9KHA9idXWkOEqMNVH5d8v86AK2Or5Z9zC5WhQ89aHupYC8S7/M7N/DqpREj4S0ATrBy1GlX1CK5b3RjzZXYADx2Vlac+rMkm9R8u84z2TfJMUYBxOuHdtSq7BIQxoTB1mvm0ppwsAEvjMBwi3WrXwSvPk9/bhU55WvbswoiDL5ChKs+I2ykJzmRaatLKA1z+UIyI0bdjwCzdZviu22S8fqGybXYidl4q/jlIzP9R+pkSwm+AFNIlQAJtrMsoMheq3k5DXMdYpGP11MNwQ/kCF4PBWsEqnAtf6tf7t2n+Auj5s/K+Uf+QMkklhJ/eEj96xRIIq2rTIckf4xd3IGlWZr0QuNFxiciI6VHfFfNg+umAJLpvcFsP9pXbKVybr+9lYQVMYp0EkejZIw0zMMhn/sijKLTcWSY6E1QoSi9OtofKnNlfPfxfKDkRXmlf8zSZHjigJVZ1s2pD1z1S7lls+hgNFYbvd9/ADbB+8RpDK+3K32kX9kGbUK92o07a8XA4YaJfVRHyfJrUYUNko9o5kyT0aZjihqAXk6m9DPFTmq6zR5jsTuz+0lZGh7EL9okHMt8bNIIF9cDmkSRl7hkh17IT+vY+afz88dSjlhtIpGH0oSG1BDUzd7KRWI3or667vwiVsdwpERuNQMMgKeqs0zIBZAVvMxTxKWXVoy10aZ56p+2ZEbLI5SfdPsRsJisKql+yalx2E7QaJEpbRQgycg5W4/loifu/DuXkl45Pvj60CxPA0kjh6BjdkUNDl5Fx2xnpPP1BGUeRmeXMF/aR2VGuh9tHyR3d+EzfBW63G3SZGiU6JDeIotpNpBPnTpq8NRoAJYVQdG3lKhhPvOmALdK3+oQt0TidHmEFt96z1lQftMzgBBKwWIdNmkpr7lckkpfSFMborRL45udRR4NN3Qtd7Qq7AMyIOaPfHviduAgJUh0MgFlrt2x30pQfkSxvyEVdmbtP/7aZm/mRSx5+uMePDzVRYkHsyIqZLvevi8goCYB+98dESSX5Pc7mZiJ6q/rTgeIgGxXCudKkPHnLEO5D+lSlOzH3J3IIR0ce/xcr+2NDvPVi/3+UGWUYNEHdOjDhXvhKuPMAvvkajnO+7HCuoa6c949Ws X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad617a4e-05be-482f-691f-08dc28b7c13b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2024 15:08:06.7948 (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: AS8P250MB0345 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/rcwtenc: Remove redundant zeroing of buffer 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: +nchGNoxFXbt Resetting the counter of used elements is enough as nothing is ever read from the currently unused elements. Signed-off-by: Andreas Rheinhardt --- libavformat/rcwtenc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/rcwtenc.c b/libavformat/rcwtenc.c index d0e469ce65..084de6e205 100644 --- a/libavformat/rcwtenc.c +++ b/libavformat/rcwtenc.c @@ -76,7 +76,6 @@ static void rcwt_init_cluster(AVFormatContext *avf) rcwt->cluster_pos = 0; rcwt->cluster_pts = AV_NOPTS_VALUE; - memset(rcwt->cluster_buf, 0, sizeof(rcwt->cluster_buf)); } static void rcwt_flush_cluster(AVFormatContext *avf) From patchwork Thu Feb 8 15:09:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46112 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:a586:b0:19e:8a94:b663 with SMTP id gd6csp326398pzc; Thu, 8 Feb 2024 07:08:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IGjaNqGx953mfy6r/GYYYxYRBO3rqlbgZ8HzpJnUgKNx72KKism4qFcovzS/xXPpoSB6Bpt X-Received: by 2002:a17:906:3658:b0:a38:504b:867a with SMTP id r24-20020a170906365800b00a38504b867amr4532281ejb.0.1707404907869; Thu, 08 Feb 2024 07:08:27 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWl7MNMgb7rSWa21wLGdMq2yN/hLjZ/hsGAEqKKjAAeR9M4rKiPEKPyhPclPaEJGkzgrhIihCfPDk3KM+Q5ZmvWlo5E5P0Wzekb/5Lcsv7rjNmw2ST04XA+4EgXHlWDBfD9yaU4F2nsDuZ1jCfHgLRWtzgpuzR9WUHiPDv9NxUJkrJvX4+QuMNOQBjGJMcDNuzjgMUBXtKL+WqKkIjGKo6eugesMo6Uy3VP0cmDw5tO8jslNhNBuSynGwgAHoJGS1mJYlXU8e636lA/YIqOJQvoaZt6gU7AXiaPEphUpLPnp1p2ZphJnHlFQUECRONADpzkv4Ur00A8N7pQGBuMLin0e1TArDz/MBScMBgGwCzadsCoZqdy5rBxB7h+2JqYnTYK5EX6hjsDgLgYppk+lIER86FCOFH8Rd9TcxBdzdYn0AmizSvawnOkftJ/EDlDjbHJX3kS+K8dRIIxbzmArJAW85NaMabNTWBcf0/X+87jWz/sLRGez1jIubH/ihoypebGMlrC5eY5aYFZWk4a+sGmlh/kyvvX63yCdVruw8x+asUTnqZmxEgLwap6sBNtEv/hrHLiGEbTElabXercYIkEU3R96fLpT2rVk5P4XxiKGgxAfwzgn/Q4jxOAD9EdCYisopqftObPxYGKe7ZXP27XAN+EdhAcd3M2cWaQbB3XFIasB4czvJYmX4s7sMa1v2DSCbn7KN5KYvb+cL5LVjNDgDCTCCUx8kL/vteXyvxWpjoGVyT8QkAocqdL5PPcfLify0eF/bz9T61evcORe9VGeoUQJ9um35HhzGrueSzMAnNmJNNEKk4Som2MvTx2RxW7L3kVSSirfWhmNSRW3iS+dAGtL6IdkrzStQvRrxNh19gdXXyl7xeZmlnmGRugDsqo0PrOpu9LhaN3if2GoW5CkNuFpen62ANUlFJTcf4z9PN6MJhxJUvzC6maD4nvlZq/Zq yzU/NOYrkxurPJJDstsLJPABldbd2Hz6v7A+MMaF5370l9y/qBP8CkYE7q4ld7VR23MTnVDlqh/wsbUJ+P61BrlS9UVsLI0+uc+XSK9CgPUt/lvWP3g4hL0S/Wai3WVSsgtgCK/TF2ugL7GJ7YvOjvlKGOPxoFEQqX9uPT9nvfb94rbJmoZTTBwNpalrF8qdL8qncrxEj332hKROVT2/EtI8pa/HpYLj9kShgh4/Nfkt529bvGChSVUDnToS9k0sFpSb/NtOasZfnrpd3asb6+OHz71DRX81oEEsIsKcwkrsk8roUK3+qnIWJRdb9IUUJ7NlmGoIHRB9lZPNQLRWMlw8dMJKiDCzT88YsSatCE0PPydMHCr50IdP87FQrP2ZBh+9s0CsTpjqkgnMiurk6NFK4X8h4qYg6BCKkBftVGlCmleoYs1zMTiRY1B+kY1NgeZ+ZTO+yVCYeMlW1vaQzGcUa7jpCyU9gmnaYpMZoooCVies54BBVPQYlugGWG/zd01rkXYZtjR+k8nnF5NKu02HoGjkxXNmx/oYUxV3niNgLirgOpQXc1JWfvely3Q+nAsJvD+9U/Y/mcvneeftCiIN7dly+9/w== Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b16-20020a170906039000b00a3826092422si125862eja.269.2024.02.08.07.08.27; Thu, 08 Feb 2024 07:08:27 -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=gvZpjDmA; 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 74FBD68D174; Thu, 8 Feb 2024 17:08:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2021.outbound.protection.outlook.com [40.92.65.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BAFA168D13E for ; Thu, 8 Feb 2024 17:08:14 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LCellzjdvy3LDRl0/07Vzfc9KzuXj1TfG8y6eQJw65Yl63VAjQHw8RkJnwbuWFl70AdPxT7B9HheqbdqCPiEjCPrfzlzm2tNxSsUWafznF9pML61m/kd6QG1PodgxOv9ZUE837scmySRrciUZKJwsR1CMxqB4gU1FsYXoK6spaF1kYojztCfBApevcPTeTfomRR/mlJNAO6FK3hxzKe0CTXSvV2R/1HaRVKOwGKLp9M1GrKx1sWTsecAopgIox4boYYno+iDIVWK6b0WBwljMGwl0FyEOfmP5Z10NTw3fvjN22594Krqmw5TPc11Kt5l4i+0HWB6OE4VmIAtdTUWyw== 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=ihvm+BiDwCl88qXhVQMRuUERiB91MSU5tsX1Gd9pHxU=; b=KTBS7daZk3HOo3R1huXHepdQVbMXVkymkrptkRUpjgHd4QbyDnOJrhNAItCvyR7oGU9qqaqspiJl1MnqiXLXNquCjsQMGqnUG8DbD17zwDz2rFzGdmcvSm4czEvENDHTnuMX7EK9uNF4ftmrXC/UxD6Jemy4Hw5q3v5MGBeA9RzbLvbAQGGdc/m36LnCvjy1bgiqctRPT1nWFBbS1+nJ6+8OxCRz/uZKxLLtH2XeTE2yWZuDJlsDk+H6uRNtfHbKs1jun1k4Y7k9ab5TAaZxiUXF7DHtCgCK8nD4MU28qm9XFyoQut1szNZg5oy8IywQfDRoZX1TD5mCU+IIP51fAA== 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=ihvm+BiDwCl88qXhVQMRuUERiB91MSU5tsX1Gd9pHxU=; b=gvZpjDmAaffedVqnkeZsw08q+kWYemM6cLXM0sup4CYHD8n8AXhfyknCPHzZ+v1qgaUY7otpucjeGdvn3Js1NIR1JXVcI1zIvij7p/TKKFgXcvMSTkKcGmig3NQiXwP1rF6s3c7Ck9A3jNlfpfVctI21bKh8U+ZtJIjPm8I0q0x/YfX2NShWNDn5ped4qP1TzgCu9+XZUsAbML8TTsr/k9WbxzsA/x+artTfserswS4E9h6xOG0fky60b0UKt+Q9ai1exFvRq05Gg5OAy4133fbjfDMqNKMGuUGC5e97yCVO0bllB+cr2098troy6JQLJa4JmEj2OL5+T1lJt2Uf7Q== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0345.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.37; Thu, 8 Feb 2024 15:08:08 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7249.039; Thu, 8 Feb 2024 15:08:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Feb 2024 16:09:54 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [GBORbjcLb+4ULHuh3QI4mTGc6I78GN4xpszERQQkWrE=] X-ClientProxiedBy: FR5P281CA0014.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f2::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240208150954.477663-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0345:EE_ X-MS-Office365-Filtering-Correlation-Id: a37c076b-0d9f-42e5-138e-08dc28b7c27a X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YBkIFkrmqad9jyRgfj69S/AVywiPHRmBTItCIUy91/3nNH3bBAqK5ED5vW10cnubYweuVUOmUuM1ZeGggxBwtx0xhQdkcMCWOKVpQEfqvXl4qKpnPVN0RfYBC83iEU1Efe/4bFN820nw4p9fMiddOSMasbKpOcL0jMzx1i21RsWFDEv0OJVjcIev642ZndmAq48k1cYkyKHOfNSsjW9OMu2kV1BwcUp8gv6dBKU8JYyE2Zds9WULA8B5xO5u+//oJtwMy1i/x4LW9mRH3WKOsUWDVnb6kLxmt/fuSs4BdFczMok5apjA6wKtVGjf52AZD8uPqqTrWQRzB9y1pfaO2X7m4bA4Yy8TchWdCEQEmZSkRyHgQMmzCxy7D5oeTJJavO84cM7qs/Clb8+7yAbirXkMGj7nlEC34ViD5vGnPzmNXZtVd7Z4aj9NRGaQQ8BYiSWVP64c/i+3a9nBPgQu8Ctzd4bgOaztZUeM0eV7ToRS7Qc75DVsGQ8AohSgzrPIUB+fRBaSNBS9yJOogJ8QaiLoLcdRFlWrcSKXBtYtWhIuXFl30WNu4p/AXhH7wpWuYxiLVrl771MeoUbeTKtPBDymAgFFmVZM6COZfIv9TYmRDlyB/+qFd1IZUNXrt8wC X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: U7ZM8TQg+QslOjFiBU6+qAGv5Dv0EzqeNaE/WIdCVqqD6W+6QTcvCmMK1MYmUriqUdBxyl7yeVcd80Po+zo/V4TuU9IJUgOweSN4cjAcHrCwlrje5S7gceypAWh42Q9rQMxa8jyes8nRqhUXfVHWcMdGIBdbdQVVtHvcu57LHQihLRL7e5OZVxEGvVXCqqlfMKgv8zwyNc3kJCAqa9gua6OkB2nUce59vjxQeEWA3alzCX8KXccLV5Mfj0g7TyX0BsaTAxHbn0JMjplJmHSjGJMzIAz08gQtVcmipNpqIhhdgK2DZVTC8FBpJQhG2F6tqSMFgQaR+fHkWR+gaC19inWxdrgwdJ4WkrcRnzuc74Ipz98ptaefUetqSqFJEgthjJrF7pO8OaABLvoup2LyU9/a93NdjglPKa6LmQ+McYgQUR2u1v6l0z1YN1NxmmO3T4tV31Qtcwhr5YC0ljSuIR8+vlV72cd2yjudPQiYCqiibbuKNFw0Kh08VjGqnKUJavlfbC87rjPHnhgRw5tVdAjNregDKIP/eONOO63E1LDpfl4jGHctR+BFxdZZ+kQEJP3xf7KRQ0xxpst1LW43AGOCjOxPoQtPo+75B4S3MSaw2325ZRlYxUfkiW0oHTWeqvZx8EtvC9LCt34FCVYfWr56y6vLMFXysLw+vrl16aNp1rTihWP57LrBB52i0X7ijHvjQpbKyF1oHvvrWBP5KOIO/kojaiyBAoVvZ8PC6vrnp7p+1YHy1kLlQzDX5R6y1xH7gp95YJky4UQ4wgOThPzQ+pcDUYYmlCnuKytr33s2Aaj6BNJFH0q9tZu567YpuoRpDZuuLn5PYwHveTzGOVhYMxuwi3vSm6oIMNDbFpe5HEwrekQahoa0LI/H9d4V/Mx/C8rdQOekRPmxwrLyBZyytfCw78ywjSU1m188pDY2wFyzvE/usW6FkNPMBgDM6oZymiCDN+UwTS6JRw95bpGd3TUq5Enhn9cPdAF/3rupolELUlOLeyf9UgbYmX3ykYWQN0/FgZ1PaQgBU5DpUEBIEJLvMfndTCqG34bdSlSXV4cTEUDhXzQgb4x8JALieFgQtjue4SiSRyOQH693THMTjmigfu3ne8MEDJhh60m4GE/UDXaSRJn4vyMHqrrJDsIkZdf9bqhS47fvykrtcHFmsoj49tI1fXKMa/elD8hjyQ9wkpUpbgSEhm1db5gpALr7Ps0fAcawPxfqrbI2ZT0QbIiI224oioY7y3mzCNnWvMkYpjXjQhwBtfxOmPDO X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a37c076b-0d9f-42e5-138e-08dc28b7c27a X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2024 15:08:08.8222 (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: AS8P250MB0345 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/rcwtenc: Pass RCWTContext directly in rcwt_init_cluster() 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: qyHW3D/tOLW3 It does not use the AVFormatContext at all. Signed-off-by: Andreas Rheinhardt --- libavformat/rcwtenc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavformat/rcwtenc.c b/libavformat/rcwtenc.c index 084de6e205..7d57fcaf1e 100644 --- a/libavformat/rcwtenc.c +++ b/libavformat/rcwtenc.c @@ -70,10 +70,8 @@ typedef struct RCWTContext { uint8_t cluster_buf[RCWT_CLUSTER_MAX_BLOCKS * RCWT_BLOCK_SIZE]; } RCWTContext; -static void rcwt_init_cluster(AVFormatContext *avf) +static void rcwt_init_cluster(RCWTContext *rcwt) { - RCWTContext *rcwt = avf->priv_data; - rcwt->cluster_pos = 0; rcwt->cluster_pts = AV_NOPTS_VALUE; } @@ -88,7 +86,7 @@ static void rcwt_flush_cluster(AVFormatContext *avf) avio_write(avf->pb, rcwt->cluster_buf, rcwt->cluster_pos); } - rcwt_init_cluster(avf); + rcwt_init_cluster(rcwt); } static int rcwt_write_header(AVFormatContext *avf) @@ -117,7 +115,7 @@ static int rcwt_write_header(AVFormatContext *avf) avio_wb16(avf->pb, 0x000); avio_w8(avf->pb, 0x00); - rcwt_init_cluster(avf); + rcwt_init_cluster(avf->priv_data); return 0; }