From patchwork Thu Sep 23 23:09:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30523 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp933006iob; Thu, 23 Sep 2021 16:09:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJH+kkBKX5nRnsiBx/CHHNBWxosw19rP4EC/1D/0LhXW9HtED+2sbegkiIniSeaF70pS0k X-Received: by 2002:a17:906:2cd6:: with SMTP id r22mr7831437ejr.398.1632438593258; Thu, 23 Sep 2021 16:09:53 -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 jl17si7357456ejc.417.2021.09.23.16.09.52; Thu, 23 Sep 2021 16:09:53 -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=UOYx+ceA; 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 7B39568A212; Fri, 24 Sep 2021 02:09:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2074.outbound.protection.outlook.com [40.92.89.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 56C686881C8 for ; Fri, 24 Sep 2021 02:09:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D/jCT303n3jfHKJm4dkWnmjQ2CiEsfYFJzTdJJ/D+i+c+XIOh+CnQ75bb+RoNiJxe4OLaB92+TF1EC3jlv0+tiOgWKBU8HW141qWhO8qVxjeENRsdaNqCRbGEVQrTzr+0+AEdvI/879RM9x4jI1zUcplGHZ/HmUby4Czkoj6TPo7GhoAJO/QIJ5MiLefFMGU0gxnfb7wYMCKmhuwwNYpPnf8JLIeiW4lMZZzfJgtyi/HwVOok2Lv0M99HGot9OAQ09jf1O2ogW7R5T7snq/YMP4N6e3G3w0ptvcfhQ4D+U6altF+4iWZ4qLNR/DMa5uJVaRao1/ZpdFMC0cc0NVyjw== 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; bh=kdUdtteLQVdG6Ru5Edh5nN+l+F66GaLX+dbrUHNsigk=; b=iVVdXUVklF14uqvbCnQM+ejNcnpeWga5sOkK0o/oaPKY5udkFM9h2Z7uwfuqs4PvQBbsZ9D2+rlnxCPdoTeCwfZ7CSZQ3r2W2XGgRSnnk/Y7mhlr6QKD/G/exISp/k9Emc2g5pk3kzSGPg1j4ugf4HgFusjNiaZpvqENCwFOXgjKn/Tt7FLOk3TD4Fh7sokFTOxzs9vDy9d51R576lsvO2bZAEW40/uUAqrRdxQI0xeGir28otvFiyCt4xQvJ5rubMf3N5uXJfwvI0UNcYxhfqXwp+6MkrcBAJFz9SPaVHY4q3uwqKIGYC6MJBgfgMOG+4i6O3J2cHOzbIuOyGd9sw== 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=kdUdtteLQVdG6Ru5Edh5nN+l+F66GaLX+dbrUHNsigk=; b=UOYx+ceA+qgtuA0Ho6p0HecezgBYxoZDTPG4/DCpAfr/0seG+cD41Bitl8808OFphkjh7gKREJXzzWpZiedonhb5PSWNOHeFf7/fJjpw5xMGEXb7a4j3kvZVhk8h1Po6AwGEaggHRHygo4K/nxjTcEz+HIeRwi/q8+XkIsGaeCt9RrRGx6OREaI92R6iYw6jxEnmRnh+5OrNcY1AqUn5bJHEczAkT4fpE2zumvdun5y+k1kxBPGjRfItnCL7rRAFHvUre6R51/u7/mg64KW31vpDm5ytuYL9Jxzlzrjzg6oL3hcg4Rl1Hobw/uBuXBjYu2K9Ury43VOn/GT/yXNMdw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6619.eurprd03.prod.outlook.com (2603:10a6:102:7a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Thu, 23 Sep 2021 23:09:40 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4544.015; Thu, 23 Sep 2021 23:09:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 01:09:32 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [79fQCko+uQve6/equJqkKPB9YnUMAwDA] X-ClientProxiedBy: AM0PR05CA0078.eurprd05.prod.outlook.com (2603:10a6:208:136::18) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210923230933.368006-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0078.eurprd05.prod.outlook.com (2603:10a6:208:136::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15 via Frontend Transport; Thu, 23 Sep 2021 23:09:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8efc18b2-bca9-4733-6781-08d97ee7385f X-MS-Exchange-SLBlob-MailProps: pxu8rxgqUggUudMGAFCy8Wp9YEXxVnfSS/zq73S0d93FDUhxXk4MZ06B/z2sA8OxEDAd4SvM4l9ffViv0tZ/V5bepEBf48RC7ItnSYQQ5XSnTXKySVewmIXZy0hdYoibz/kzHtMz+sLTkjycbk4oaiXqwvrW2w9n8IvaFbPh/UqBlgVcfIohfYON+iNrZgBghJoMiDW+z4LAkKjocl6FErcfKov90ELrImOEceaHQEgyOrKf0hduXo6yPeZ8lAWAyAMuW+kIoPZGrRLD1KwncwCNDh7IUFmq0i8S7SMaVDBFTX+Fyn7z8fOvY+2OwicrlRt40ynZdS1Y+Zmn40YcSnCZJ/qs3awGUgEIyucR1TfoB1qlUPRcViGQiwhU02ZwNhgo0wNQQkbP4CEr5S7UMfP6MIle+Tz6uTME5HoamL6v20Na/RJFlbxfwF92bImSKgD6yhy+LOsz8Sd8X6YU4VFoC7pjkPSRzhEevg6edFvV/6HYTBZab4VY/vijh3OE7jQsnIwRuWIUA7g7FOKSmkqgkTNiwhpLKhZN01gDgtzf7/UCWprwVZhms1eMjDZ/H52rJr7YBdyhH8DCH0Q4p7QUsFqDux3FcqDr62/aqzBI4q7chbAiv8i5qUDnI0XHuPoYxBNerwO1p8nioEHPOWnp5BFPt2RahrlU2XjhRPW2BIzdld8vWZ9Bp9f7r2W/5GcK3PPWM4TjoAh4V646yg== X-MS-TrafficTypeDiagnostic: PR3PR03MB6619: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ve3SFg4IrY67gq+UPoA5F4Xht9et2jsSecpIMhb5KuL6uD08QV+kx4vj9dVI5Ttb68Sf6N5WHysCLosDsCbA9+wvd+qBI/mL7nlgqc4ert/KsoyLFz+v0lhRD4ZOE1QTDXet5yBXcehxCRkFq862ocj5+DocO4KHt1DadghDbOigfdu/LPgPJwCHoPp2VoR2nFc+hgAKHJIjrP9Goy/DkEKbPubugPpVVWnS7rXQrknywYO8geTnuVPmI1UQSE6hXAFIz7p3Vk1PQFcsQTMUAWNjljJ/Qy+slBDtFS/I6T9o33ezwqpM5kgC+JDd6e5heaIANyiDQFpyjjzpyRFNvrn1NdnEkdS1S34Z/j446BVWuZGzYfcWb86C2XDJk6q61zGvSYEUMJ5It0rE4xzEJ9Rb4TyFM2LC+r2Y+45nTdHAXRI1SvQnDZB7unKVz/ub X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /saRYZzshWdVqOVhhwGyx3xNv43fw+arJsvyoqkKmTUhkIDTUg+m1e/seeZqBhOeqUH7Ro+Xai8mN2Xd0eMeSTL0tFcQ2TM3U4BA0445pDTK3KfzV6F/s5DJDyeonyuzg07FQsikKnF7/CoMjynnQg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8efc18b2-bca9-4733-6781-08d97ee7385f X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2021 23:09:40.1681 (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: PR3PR03MB6619 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/jacosubenc: Fix writing extradata 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: 0Rj6LPdjpvpz The terminating '\0' is no longer included in the size of the extradata output by the demuxer since commit 36e61e24e7ac737b38c4382d439329352d9e0c29. E.g. if one remuxes the JACOsub sample JACOsub_capability_tester.jss from the FATE suite, one receives a file not recognized as JACOsub before this patch. Signed-off-by: Andreas Rheinhardt --- libavformat/jacosubenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/jacosubenc.c b/libavformat/jacosubenc.c index 324f2957fb..f0548bb282 100644 --- a/libavformat/jacosubenc.c +++ b/libavformat/jacosubenc.c @@ -24,7 +24,7 @@ static int jacosub_write_header(AVFormatContext *s) const AVCodecParameters *par = s->streams[0]->codecpar; if (par->extradata_size) { - avio_write(s->pb, par->extradata, par->extradata_size - 1); + avio_write(s->pb, par->extradata, par->extradata_size); } return 0; }