From patchwork Tue Aug 8 16:40:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43182 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp2408624pzh; Tue, 8 Aug 2023 09:40:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHCaU+xYRYIs1x8BX3Cxu7z7xlqU70V+4DK/9xaiojp3MLqoPZ+0ipStZA866d8C/0SW3U3 X-Received: by 2002:ac2:4c30:0:b0:4fd:d9dd:7a1a with SMTP id u16-20020ac24c30000000b004fdd9dd7a1amr25963lfq.31.1691512837350; Tue, 08 Aug 2023 09:40:37 -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 w8-20020aa7cb48000000b005232d42dbf0si3792552edt.584.2023.08.08.09.40.28; Tue, 08 Aug 2023 09:40:37 -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=DBTbL8Ov; 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 5092768C7FE; Tue, 8 Aug 2023 19:39:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2103.outbound.protection.outlook.com [40.92.91.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2B7D68C7CE for ; Tue, 8 Aug 2023 19:39:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SLO9Stg+Q2uChl/ZogMAzwaz1JlMXhZVGf9DzO/AfZAxhYNIlpp7TQnVZEqtV1tn2WHujn+GMzG/Hza67si3OdwaMdPhBrNnT6Bhsx6qXgoV3/DSgT+cXOZIW9cmx7ZBxCUA/8APrt4uHkOrLx1mxxmmNL+H30EndLZTTY/KmT1aJyYhfHMaEnqMbJFBI8hl9WeRYNnqhS7RnPPnj4m0Z/oykh812CzaFIsit6n8Ovz/TBYR3Cnby885v7k9U3J8s/ZYZi7ueJ+RjnVPWyJKVlPl9qW5HTKunvMQhkyFK3lWKyrBnar5OrZC9EbFWJW0aBXIaz7bQT7EGwyQKiEqHg== 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=pFKutj+UYchSO0DbgSSNM/aWciHqDgzstbWnDtWykvU=; b=a84SnQuS9EQttgUD1B0NnN9fVTdGURPAjQOdtwGLiAMbLve8fwBty1stqpltFttubCyRJYOsqppJC3lWV/AHMXffqQJwS/WewtacvFnKHbNT3vQrn44h5SnBiCp/gjwpjgVcThFQqOsqOTlYzpNEkNO1ZmP71Bh+Cty7MzrkxW0sLDzgANVBEnjelB/LCPGM7uGrmD91ZmdE6b9xNnyoe5Pj2QSRQ/s20IWI/WH0ogc6hG+XCjxTVeZcPsf46miMmUXI31Mt75WWDzV1KAeY010u+ALCo31BPPaKsmNvg/fdaSIc+M7X0qToKlmyuu25R4gLG8HArB4PO1aqRFJiBw== 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=pFKutj+UYchSO0DbgSSNM/aWciHqDgzstbWnDtWykvU=; b=DBTbL8OvVbUY5tFftVCtjgwlI2U7VU0NGqRmpHsMVvIkLAEAOiU66pSkRKBWcNDS9J79it1esYE6fVCzWDiGDg+eHKZNEyDaa65G6/xwneZBIBfBY9O8XLTBKy+xgCPfHr+ilJiXjL/CfO90AGLnfLn7TuO54gv0nkgruaxoDJ621TQrum22r4Xq9f7ryNa0BOczKrjfJC3ou6y/TQ2tMg1g7a2NBgOHRCDrZqePvWOxcd+ViQXZQGl8FFj9RB9SLW/+jNp8JeY7Pr8Ww56gq5r/DkIc3QjcW2GgYnrhv/dQ1e22wgRbKGG4WDTsRY3rmS4ft8VgH0tFgG8sRjAiiQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0268.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Tue, 8 Aug 2023 16:39:45 +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; Tue, 8 Aug 2023 16:39:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:40:29 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [IWtRfFwF6DNT6W2lpUdIH78pAL0yctDym9s41JVwrvU=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230808164036.810177-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0268:EE_ X-MS-Office365-Filtering-Correlation-Id: fd65f8dc-cf77-4083-7a05-08db982e1252 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKy65eRJXb6jJynmsNGeDtzHVyKRQDApxHRXCmJBE9MbGcCm8s7/tbGlhByifqn3YJxqFwmgkzI6CmleEGWOTFkdDctX4gigVHY+NlhCCYyYvI6DXe3hlIlPtnjofvesS4VZo+cbTrqs5ZOElCh40WdLeVTv3Y/9Zu95+u+x4+uEAbUwJ6zAr46dG2aFjjnSBmYkMO64l7EGljZo5EJrbExrcIcy6gFtSFxhBvQ5u1+WWcXZWWJMIozUgq4YY2IPO8ePNksZ12pi2MEywDYdaCByyfbmM28B1fVKiNKRXfdM7TgRXw4LTlHZRrNUAmFx7HD+bSjc48LkKKQNM85wN3vC2PJp2qV4p7Tjum00xjmdolxsfWBwy3WRHjdx76eM1LCrPlNTLYhhsn/sz1tPq4eD9d5956sKYnPJGcQrhsZLzJiFjoGV8KjLJSR69rXd2uP6JxFLxtte0U7XtrddQ6gdWmFp4i+2JiVyj3gr9spdMkxE1U/F8ISoOz12raCsKOuweA5rgvdUWW+arMYJrdIchp+cMimWHOAsJBjkCe6vNH1yy4dVGS9OfROfqNmmjTxslUxcWdJ4j9GkCjqTeuRXM1VadQHgp3HmGkEwRXFFbiKIPYnXSBy7fvjAY0lUZfXpkulu8x6PxP2+zrz3LrdR3zxSQJlR3W0fykfikI/tMxiDrbmk+eah2dfUKY4dxFcV4eMLbUY/+DT/fK6HWjqyWMYs7IlfNRA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IwvSwWc4vNEJk6gE/L5GTtju6IZdImLYHat2jVPV17exXagPpC7F+bKtcfrCJ7JZzLlQiLT2XB/Az+6MWoqghNzFYNWIVX9QiTc94c5R8t7QK6XsDcMXoZmX10RkDDuTnf+Ljqc61Jb+RcksK8XqvaBZ0lcTECYyyy1yYdEaTd63IsTgjnDI+ha/s2QiEJaK3sYJf+kp+DnEDme9J64XUitEPSu2NdCdn6gKh9J3lqrzn/nvOsMnBkiAUWdJ4idNy6QCNHMfD+I4UC9hS+bvb9ECdN2ojiAVOsVSV/yzRyFZFCFmnVCpgjYZR/c4kL2VhW9A17p7toJEuscj1uaKHIdks/lMuqrJydffZt2r02tv+KqxNRV6NP2o3mp22GqW/CaFxduTH8b88qiOr9lLBLBR8tamoAlcmF6873xGQt3Y4eh5bISQXtiU8UPBIeXctjxNnAM4Cxqa7Abp4t7/bB4xkc2vySKVMabaZwoxA6eWUzFPlFnIZJhpQPjVll//y/tEoOlpoiCxHJFjMWVrduBRGNeXpPn7Dzdnng6DAxzmZvv0NyLU9f1QRrJgW2rzZ7IYC5Eie0DG/F5AHFDbWM+aBgZyWflE/g5f2CjL0c9Gz/RVfHDUU4AtXUGbHys7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: W7WtMpTv1VLDX9ruLGjDmL988T4ChymJ7JsEPhFsr38XjW3cUW6u5sUPZ3Focx4scPxKreelRA9iiIEZDEyBJVBkM4fP7pujK+RcTvg/dRvVF3fBXk8+XrPiWqFBEYKY198LYrspaHwm7+edgxpK01dAuROHgQ88CxoqFgUqpTghLxgvuVQ7Fjibp8N4gGR/kmclb0TpUNMRKjzYeiH9voVXL/IGAp9tD8qYx10XIsdV+PPq3AiUmgishvs/6iV8RRq/3KH/SqV1HrrhY5X4y3QEXi46ctokKG4oksihbSijJe7Rq+c8B1PK16wLNviwsRfKxEWylIA1+9Mbw1y+6/5hTf8tC7b6BsEAGqr3/4wns6amj2E5vMS3ZC+lJTmOu7r5jMlfdY75KX9/KdWJYr4+XI68ZnrnRe1oQMs4Os4OVjiwVXHH5KXG5y4abeZnJWfYKhzs+1ai7CZK1IXHoBljFo8gl9whHFcdfNIsKh66TmlEknMlRissNZz5NUqn/iaulo9BUGqbTI2xJ1FoT85P+IxymtnHZTgpgI3HwSl13r9xJvkVGKpBdB4RmCEkprfiP+wV+5bxzitmGdC06u5vI9XoCJpAHHTV9cVqEW8hXoZ/3OldDvz4lUQQwI951MZR8zj+GgxaAY7HPN357RkwtqdvTcZcnFWA0hop9EQuB8LUixEGW2JmLoCf8YifAZg2dgLdhNaVfHZPnZE1OsCiPFT3fswGwgc9331riF5d8iLkqtPZko1hcXVHTpwSoZ1xvAWPOhJFBovM95K9ol/zelYVmAqqlfGES+Ddtycb/Gtu7kOxSvfRz8rBON+onMg1JaX4tLVNT68yKTqCPTFy0evK8J1qv/PgSabucBXFwsfsJy9sa2yKTxqhegp8Z2Et4+qW8k1sFlK2ImQhCLNyvkN6yfWfmE2QShxlVsx1TvX+niUgDrQy++qma8ob3SpIZbh/1T5HCfrl1FG/jbCbdLuMJnxOZTfGzIDsG/aUcPwOd4tutegj2D3mptsYgSVPr3KWPMe1CjPSX3AUGXrzFRwn4HZmc3Pn+G1CVaSLlnKcMAjgUsWU256fcZwBDuPwco2pljXP9fUceheCvRMo61EgNJH8ecy9+zn1OnH129is7NnsGJsDd286DZooijPOi7abcTtiWhvj1tSg36f6JHkKpU6YGddwMUd7vglPhxe8kxSQS2B1PL1bhQfadKIbh3cBnn/gPR86pB52tX3kOi+elocu/bq1CA+icJ6eP1eV/UuoYuUt32aMXS1j X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd65f8dc-cf77-4083-7a05-08db982e1252 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 16:39:44.9409 (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: AS8P250MB0268 Subject: [FFmpeg-devel] [PATCH 08/15] avformat/matroskaenc: Use proper AVIOContext 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: +edMsf2ilTQ/ These two AVIOContexts currently coincide, but this is not guaranteed to remain so (in fact, I have plans to write each TrackEntry into its own AVIOContext). 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 9fd4cf2f6c..bfe6342d9b 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1679,7 +1679,7 @@ static void mkv_write_blockadditionmapping(AVFormatContext *s, MatroskaMuxContex // We can't know at this point if there will be a block with BlockAdditions, so // we either write the default value here, or a void element. Either of them will // be overwritten when finishing the track. - put_ebml_uint(mkv->track.bc, MATROSKA_ID_TRACKMAXBLKADDID, 0); + put_ebml_uint(pb, MATROSKA_ID_TRACKMAXBLKADDID, 0); // Similarly, reserve space for an eventual HDR10+ ITU T.35 metadata BlockAdditionMapping. put_ebml_void(pb, 3 /* BlockAdditionMapping */ + 4 /* BlockAddIDValue */