From patchwork Thu Jan 6 10:52:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33115 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1535252iog; Thu, 6 Jan 2022 02:53:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJx61G//qc7N/z38KoD9DOw028l11VLvJdElfKSRkBFonc1bmotSxPVPOPTMHtlIdIAm3pTB X-Received: by 2002:a17:907:7e95:: with SMTP id qb21mr48479755ejc.105.1641466387330; Thu, 06 Jan 2022 02:53:07 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dd13si839753ejc.974.2022.01.06.02.53.06; Thu, 06 Jan 2022 02:53:07 -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=SZqrcu8P; 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 17E9A68AD9E; Thu, 6 Jan 2022 12:52:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066068.outbound.protection.outlook.com [40.92.66.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 348BD68A255 for ; Thu, 6 Jan 2022 12:52:47 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oTqIW6uxRgPCI0L0NY+4KsD1XNp1nHjgF9DreUL4NpGqpBlF3Wee6a4mAmj/jonWhRnIMqUsC3glcUxGYwKdwqGbyllfv90hc0WqVSjVOJkSXPbSjqsyqDpw5TnUHlSryzkrDe+4YQCpB/zhc1cHzt2IWk0gGAEXiMgb+twxDP65Cw/69hZFH/gKl+4k3voqgEljt/qgACF5XC8OWAIqhTkw5/yv6X5X/oni46hTfWtgD1lIZ5duHsKlyY2TiczKs0TZU5+FrSGMO36qN5trsJIv2R7Nqv8sz/4F4Q0I4sohkuHwewxW5qPfK0c9Up72dZXn+mK2D7T61UaVlx3RCw== 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=cvQoCQAzrExd55NQhCSrw5QuqDTuD9VpPC9JkwzjZ6Q=; b=J+v52Frkknih5+2gBiP8CHvolMS6J/cu/2FXsdQTgFCm/AEWwB9YT7ue88JX97VMpN6xvWnBe7bkI1X84/xYEP9etOx2qPG801U3S4pBG7iD+Jbkig/Gi3YaQgLG0XoIYQn9SDjox9TcSaYBEjEB7EcKcjr46YNEGh6fdXaRGyquIfWYY+8PTLSDKFIouTBfnrJfVNAcbSZioh8JzaAKSh9iC0gpWRDxMiDfr6zM1TqJeMNG+qi849qvXf3tgdHMYLOE+WalREVWlNhcMmq0wRxEqamb2wyyDGwUo7nIrvtfA719EB1C2WwVMt7Cuar65pAPVmG2jAGWN/s/TDrMNg== 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=cvQoCQAzrExd55NQhCSrw5QuqDTuD9VpPC9JkwzjZ6Q=; b=SZqrcu8P4s9/oZR2m5/GrHHUbUHHbhqpmxal6wLKxjDE1aC+5KgTWS48usO/PwHD1DvbquerPRfd/iD+h6DOTFnscHi+b3Zd4vLp5ezMQFODwpAhvhrmpuFs1tyr4NHp4YFCT6tKTr5HaXIFQf6/7ZNn10ifhEQ3DKSM7sZCDtTDnU/uiWmBaKnwlHvlVQstdVn+7kmReeY98+b+TW2pIz0sG+U/5ZMaD14NGZVVRDTiw/4MOWffZOtrFXTIQJLlJ7deFgTYrGuKj3oIkzjxQA9FasdsiEi+7MbhHGBOyjCfIbCIuM3iW/ELe0USN/4rOvkQN5QeAYlr9/Y1WTpikw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4294.eurprd03.prod.outlook.com (2603:10a6:20b:4::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Thu, 6 Jan 2022 10:52:37 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 10:52:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 11:52:26 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [ztaAhu5Vj7dtGk7ZE+v65ZNRvMFOPfL1] X-ClientProxiedBy: AM0PR03CA0106.eurprd03.prod.outlook.com (2603:10a6:208:69::47) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106105226.2200689-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b756a927-80c5-4868-ad3b-08d9d102a727 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJ+cHfC79vTguh6WqLpD1ah58uf7i1ULckI48DL7wEXL7I7XwgkSGaOdqkyZZU5sZ61+rHEtrWoyxnvOZrnSLMH1JB9wXaW3ou4k7T82GdJXEcDbbEtSpoNxGGK0/Kjqii9SVNYAfn/+PyYQZDjDacY78w+wH+TCiiA2Y2r4/ar0ghcyAxh/ia/Tl0ckCzpsd7dDUZutSTxeMOL0x35q+goD2OUT9RS7wq7YD9gIFBerk9wiQ0Vn05G7UQ25kNh2b1nkKwzN8nKeOUmvJvrqZsfRORFd3S6uXDKo9fBOIUUHWwNG7aX2CF1Qkucl4G4ol9Ft6E9iFWyMOWa4qJi7hHCzU2Ao0surMjXA2C0eS5ChG3GI8C6WA383qw37Ocb9H+XwnFChr2Ha91igvP4cuE+PnFY53PPEgFm2ZTkoE5rRYwAFSMN7cifUQ2ZHn2sCFG6kSzY0Ek9e6Na5fKbhCnd67KHjd0hwdcjzfFoNBq+i/lkRSuun65AyEsMN+wG/2bcjZe/xzGt684uuiM5l5NAOtzj1HdlEDP3xAosWCzrmeb1IealMuoFqqRTCGq94f4MpgUfzGkwZUS3+C/R65zouxLWfTCIvHBVcgs12Zq8g4Hiyh5DC04feneDrl7cuWHjWY7ycfwAlQGumDYmoV8NEzJHETte3c7NFwKxjM1HXMQkAxyf/m++9sbj9sX9uhsiv6rdFMvsZw== X-MS-TrafficTypeDiagnostic: AM6PR03MB4294:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +T1CxvutoUi8q1qDlZZiSYpwve94eMtqzQUg/ruvTeHHGUtO3Wvryh062uGJO3N+LhT0EEcudq7qD5RadYxrL762TKL1dcyuwPW1E7P1uI8uoGZ7dsx0kKNCRadsjQjkO2p5bSZFUsE4rWnduicKPTinbv8F9R5WVSDt2yOnu781Ry6u7t3ur2pOA6wxNYKeDhj7//dIlN1+dfNXheB5BKOU/o3RyE+44XxiuWzu3g1wP230e0K15Itn3DglOx4JbJr3pjjE1YZWphCrJfBjeSlqYjJORNqcf0DyFfEYiQaH4PJxBFAfFl36DSZjTywLlnYO4LD4lRuEnIBQz2019GXkqrlwaOjD/tjLWcjotGFiHZ33/SS7pf103i6/AmC9j/Axz4xrja+y/GI0TMsAvcijKU86uXo1aCuSflpnvQsT0VGe0+t6Sg2aPGnDOChzOWMpM4ZoS1XhB57lAi2jaF1lrkJ8tEzmqAlAxJp4z6ITaJ/T1fwyH2scyGbawWdYHFpCuxSk2yROPlBkhHrxg87bW4/H885i1bsdeq1aOOBqsKJSfAuTdV35kX51pMBDtvzDn+KS1OE0gSd5thFgIA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3/k2Rnw/xP5QqO9ezmqHI6EtZa7QrZaFNrY3XtrD7RP36OwfSMP5QiEFyR3WCrf0GqQ9dvAviSSWLt8sv/bnnbMiHCJL1vMtmJbfScyDUynUehhS/TZcw/jnayEClApzs8amFJ8WmhA9uHWSdbk9HyAtWtiHBn2Gj/6EYmZcUfG9JPvOWHUZrCINZdsuoAXnWwFVEAI06uv6GtLgA4xv8QusVg2wQN9ah/ZV+GPYm1IRV2LwTCSiq9htyfFn9GQEo6EWohlHrf7jbpPpNphLyjPbN/UTLUfDAk5I+zqBDG9rQKdZDgZgJrsRd7BfHDjDTsYo3fynBu+3G1+j1mMncDtrM2wgq4gYMNmypoqjKeKIG1BePmCRjSAgn4U7N0vumdC6UwpvWzaGENLehIkoSxIOF1si5BWodDF9tGB3NMA+2kNX8DjkeDEwPKeQw8EZMpEOUycRGJu4jZPquSlHwmku0BCCVYyJPtScLfJ2muDosKIGt6DACvZELy/SQ+MuAencuuC8m/Cqm/f3PGPE5+ieay4x/Xvh4A/ZjEFMIHR5NWrzO/dOF3iS3zi/geFAZFdE40H0rXserYMc9yQTkYkHOT01oT8Yzs94P7bKm7mE/Ov7C7McQeFahgWRPEXC2xhopCncZ79LMppQt+nPDRcuzaMkTf3bOgq1c15YUQFI1fI+47xoxE0jkijD8taHyRTFLs0w2cXkYJrCRu5HPrZQ9fL8rZ9nGspFoL4r0qOn8/DTvHRZOvwCXJVi79qqDHSDDanmKOTGWM0AUpYEYV+ba1DlVUszDJoq+St+svV+KZiBuL9oCQo+rklz7sheX1uSegv7OCvLbrIOGLgoZTwXss205YsVTZW1V0t7XJ6oTMasRtEoZdos6gHT8pXZGRtcgDdvfWSrUYLiboqh/xN9n9qpXaLzwMJqTQvZ0/ZL0ImwjdC1rkCkJl1wEbF5+2+8QoDT2Hmb0gD7xy0CyQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b756a927-80c5-4868-ad3b-08d9d102a727 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 10:52:37.6201 (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: AM6PR03MB4294 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/amr: Fix writing AMR header 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: pOj52Z9c4ZGe Regression since f282c34c009e3653ec160c3880e64fc1a9300d0e. Signed-off-by: Andreas Rheinhardt --- Will add FATE-remux tests for the muxer later. libavformat/amr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/amr.c b/libavformat/amr.c index 8e14052200..40d5bc9cc5 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -54,9 +54,9 @@ static int amr_write_header(AVFormatContext *s) AVCodecParameters *par = s->streams[0]->codecpar; if (par->codec_id == AV_CODEC_ID_AMR_NB) { - avio_write(pb, AMR_header, sizeof(AMR_header) - 1); /* magic number */ + avio_write(pb, AMR_header, sizeof(AMR_header)); /* magic number */ } else if (par->codec_id == AV_CODEC_ID_AMR_WB) { - avio_write(pb, AMRWB_header, sizeof(AMRWB_header) - 1); /* magic number */ + avio_write(pb, AMRWB_header, sizeof(AMRWB_header)); /* magic number */ } else { return -1; }