From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2F9AA40F0C for ; Sun, 6 Aug 2023 23:05:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4307468C6E0; Mon, 7 Aug 2023 02:05:27 +0300 (EEST) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2056.outbound.protection.outlook.com [40.92.49.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30AA268C593 for ; Mon, 7 Aug 2023 02:05:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oHsyuoWbPrHOtydRh2c/a3EtOKqW2W3ATtLBmBNX8PbTmc9CeqUDODlW89nmITtZBVzWkMoHhaL1m4eBsXJ+CA7AxHHxk5eUSLkeh5UEwHsr1R1aX4xWuRx8RYXW9FELmBCANFYJYJ0NLiMx62XfvmyEjzti/ip3E2D6Smb1vXwsH2Q1uDfQ9ZXx9bOmo2ejz5XcH5dCJCQ/szzBGo0iXRLXefV1DMCfHpvujbTRlE/+Mbm8VM2PzaWPMBoSIahqVZqbpRP2ai+f7NRDISUJGfTqhBy4WClDg915WkKXqlL7Z1PSMZWgqFnCW/bQdG9nTaW5xVTsjZifghQW9r5AGQ== 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=JxbxZEVOlHqymGxoQ+FvqBR22xVT8LPFJvMftugJgMg=; b=oT5ueYo/RiI0Gh2Ktl9P21/Tdtb9NODDTPgzqMxqCXnn7ACo/n+GnFvOvSH67o9Qs3pZSfgAb8IrZloZR8UiE17eeAK2K6cmNUO9MLn7Sf/gqbJ8apk6wPYIforkx1jsp4n53Uu/5Zd8sL4pjREWnCB8YkZEb0hwekQzWd4OhbUgu2uIA9PhwU35waZGCoRt67Nd1YvU7NMWc3ZOevbepqlUcwYOrUcTUVJFzfbXnoWG79ANnmhHxKjKltmIikIn8MJX8j+EpjM1lCBvNQkJwzI7pZBpT+/c1PLHxgiYw1u94PAdA+iKVY8YhTFtQXlu9Ej3NqyiIb4ADDECFgJ/5w== 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=JxbxZEVOlHqymGxoQ+FvqBR22xVT8LPFJvMftugJgMg=; b=thP4LW0ReZ4As6Zs87fBP+LrcAunQx8Y/5VdYuKAPXybKYpx32tKSMrqaVPslUqgB67i7lDcsYpIzzigUlNEIAxyhcGs6pFo+1LaRMOtzgvzQtSK0cOP4G7YI+kffBH1G8yOVY9CSTfZdV6MUHHsGFcTowein0LwUth3BuQG1CHfilbK9EBsds+bh68BY+Xnnllrqa8O6SrntlNlx9SfvWjEFR0yM8EVML3dqq6ltIURO/VwgaxuV5V8eMXoxRuHspvDx1rlRiQJ3ZckQX2hfXBhSRAgcOCstYJO4Oy1YFGA8/pH9YXdRqd1ocdZRQ/KHJPGmfZ1P6MPMMaLVrAzRA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0108.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Sun, 6 Aug 2023 23:05:19 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Sun, 6 Aug 2023 23:05:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Aug 2023 01:06:24 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [oVWXFgWyW+W9Grc5LnJjGdWBf1KTV9QDYtPlr4lF3Do=] X-ClientProxiedBy: ZR0P278CA0190.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230806230627.3186387-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0108:EE_ X-MS-Office365-Filtering-Correlation-Id: a5c92d7f-fee8-430a-ab97-08db96d19b04 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmre2cOvxteVHck60FqChmDUCUHmiWVb8uQP2X8B7q+SIhJwmNv/5/UE+Z/74HmHFdNyj7mUuwyZ/iwCY1AtJotCcbA+bC4V4NjXB7FzgVpc8r72f4QnoVHSrEAN1b+AV/7gSq1SGMxsAB/YaF6meGf7IHK3iWfiiIIENRyVXaaPCfhAxOkDlc9SGcUMeifK+FA92wAEOD7sEx8TsAVVGW/SobhZz+8MwpjhYw49hACeywvkcw5Dbjwe7XgdpZi9ikCbd50R9jvrQ+oZZMat4kKiaZBycD3Cxos3Xq5Pe1qwtBeRXxg+ppNzwdiwjlz1l+C7LXWezKt1X8u6ju7HUbuqXjh48jefcrt9AcX2xvjDvYkVJ02vgGcrGQr1YNLU9ECER1FqdcXfbhpjQ/1SHdlBAWn3wRbq439XwoituwwblVcrguJpT8BNsc2VRnpjKF+doWEc6nRGjbzhSAnKKxqLdutPJ0A5/6nVBJCj0Y/SZeUgRDS72uISs32cs9omCKVZaJwofLUbatwHtE8nKmfHhRh7VGJvYbfw1/SKXNePuKJ0XjvvPSoHMJ6d2l/ENtfg+yKzp/dKaBKZF5hFjQhqjrgGbqYZlH7mNukE1jZMwWNR0taCshpaokGLmhNNLkowObViQXlT3uuB24S5aX90gZBGKIoLDPqVTx356iYKE8YoJt50reVS5OjzWAJVo2TC6n1+Rq6IoQts1Z2gmrr9clDi9E/YWwTnnNJHle//G2wcfa9fz2McKPF72RlWuko= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MoX4NKAbOZtQe703wZQiO7yUiv1bQPlPQOduzwC5VHn0Z4xS72hUDuOR3+vIZ1TD9aPYePS/MyRxPG2nE2u8DG5ULKj8qNMl4oTYtj4jXFGTFdlavn0iVOz/t58XhxEiV4p2bICPjXRfiOt290Qxrgctzh6XV4AmaTVipSOx7YTglrFNfYWnmr4t2n+jXPdHnXS3ZI11iqgzKRasa1cMmjdE6Pug/gCJ9wO6kNowp1zHXJkCZnWvNO48byFpEn2dRd0C+aEhPgw+YS/oYrPJXS8M0oA9bnuthdTLIVLciGtzhioIkbvgYi/B+8UOlkqJe5+2L//mAmvo7haHQcFvzDgXSlkRovxUOu0EaGpMr9w//W72JodmP1CR9lcfXo/PvDl5udJWwVuGWU5Dx4sRbRK/d3QR3zA7s9PqD74tBrToPaZXyQ0Bwq9JzZAfljv/oiSm1Yt//6YcA9C0vnMrbXdXyHELendefT0kmPNMee3fPATONUvNyU1S2vFuTLZ365KX4Bbxm/79/MQukEjGnJiNMfDOx6smtxzZ7kV4P1mw+wlLuAYzifsoo7Lj9bryrn1cOn6H3vyOu7VOM1/j//8kwGV/X7S4cXn8YiRfE3bbGnIoQBmJVz8RfOhfynAz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?QftN9pPqCLewFKaDdm7mLVsGHaYtLkOP5g7/uQkZ80UlICbTZG3vgVbPwgGS?= =?us-ascii?Q?zps19uErolQcALxqAznbF6AmMW52cdnFSFtrhMeS56XYMyx40M9uQdvFLMl/?= =?us-ascii?Q?nEGDXNrtT3m9zHbW3eR/ssqBDKRC8Kv94RKIuhkexaeJa5f9SzjL4PEH8HoY?= =?us-ascii?Q?aO1G9jnmYtPT1RVEJQmmV2ubdNV9AXXIaDi3DBNCdhbvUE2f5mCXOL1QwqZJ?= =?us-ascii?Q?20EQLLZ10KR69DwG0aTfvHKzdCuEy8I1mCxfRkIpkQHuU4SlvssoTCLjzvAg?= =?us-ascii?Q?9mALsmkb9g0NaOe9Sx4dUSY0OyYZNb+u/efJdP4hsL4k/spWYSkImaNrK0yy?= =?us-ascii?Q?Nn+0BQs94f1rBqKIENaIdVwO7dCs6bw5Y6fRYlVIfT54WXe2U/h5KOmtG9uT?= =?us-ascii?Q?dlGrUidBq978ZTekKEsN81LHfwMRts09+M9LAfdDmBBDTSWlefgxl28CZPUQ?= =?us-ascii?Q?eYq9KDxuowoA61pMpQc8pl72oX7du4jkP3/pPguvi9PoBY9ELTpJpfm7pAuP?= =?us-ascii?Q?Bd8Le92an5nh77518JMlBVmNDYiTLOpNHl+nIeI0biyih/i+U4tPypBoSaQb?= =?us-ascii?Q?Vh3aVOXDfqn1LZZGOjVs1NeVi3NPYp5j++9qFWOwQ/sf3W6knUbToGgkgR31?= =?us-ascii?Q?Q5mxhX7CSaAP/7ssEj0J1ZsXBVphTOSN/fhkcNj56PBgq5/EYeeeyUUELcn8?= =?us-ascii?Q?hcAvIsZFJ7O6UDlZ1fMeF5AHIYfqUJpysCbhuJFCGoCaJMos8OUeyMo7WIec?= =?us-ascii?Q?Et/ZiwsSO1P9ej4Ib/NBE2SQaeCbeQ9QL9bS1hwoPDoRmxoD7tvvUptpltjd?= =?us-ascii?Q?XOb5b4FrTB4j0mX2D4i6s/wC4z+UGXVyZXImDSYJ0a7Z62L9nHuEmi0GCvD4?= =?us-ascii?Q?cDJh0vs/xzo2d5BTMamOTZtwDVxbwmO/pAxifSNuXyn+WuCA88yE0cnmvXWJ?= =?us-ascii?Q?9hHSkhAxykZ55unq3tQ4B3KBkZL3IkRqfydXAMTZHL7EFEIxB7TB5W5D54e5?= =?us-ascii?Q?rSIMSqL5rp288tPNeQJ/QOjUsTpB367qoD/N9OSSWSlbOFfE5DQjqMOguYqH?= =?us-ascii?Q?UirEYNOC1HTtulLFeF+r0Hks7VC6UY/jEq8yn+ePPrVwMt2ucaYzltZUAZ26?= =?us-ascii?Q?4vqtn5BUyj3BMQjRkkgzYwm+C/qduE+RLq7D81DyTUCpvmJKZkK48jekoZir?= =?us-ascii?Q?jLzq6BL7dJhX8PN3N1Pxt6CXoZV8Txub5+CYpbDHSFNHquqAgCBDP/RBBJ/i?= =?us-ascii?Q?9zmdrHks4wH5V+ZVoz36?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5c92d7f-fee8-430a-ab97-08db96d19b04 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2023 23:05:19.8776 (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: AM8P250MB0108 Subject: [FFmpeg-devel] [PATCH 2/5] avformat/matroskaenc: Don't reserve unnecessarily many EBML elements 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: bda44f0f39e8ee646e54f15989d7845f4bf58d26 added code that potentially added another BlockMore master and BlockAdditional data as well as BlockAddID number, yet it bumped the number of EBML elements by four instead of only three. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index c1f40b26e6..7eb734f1a9 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2709,8 +2709,8 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, size_t side_data_size; uint64_t additional_id; unsigned track_number = track->track_num; + EBML_WRITER(12); int ret; - EBML_WRITER(13); mkv->cur_block.track = track; mkv->cur_block.pkt = pkt; -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".