From patchwork Thu May 30 00:03:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49375 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp999466vqu; Wed, 29 May 2024 17:03:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWMOyKCsF/lozaJEgQ4oE6pOKDCxbqf3FKp7Lx2iYtzeYUOdIf4qEaVGq7PmyFQIZltTcIf+lCU4od0WZxzGWZjUQbfduras7S0oA== X-Google-Smtp-Source: AGHT+IFxtw7ft1UmMZZUXT1XxYsk/LtaLDo8qDEgdMKmiu0HNS8BDmZvkGlhW3s8N/+no9nvNmmg X-Received: by 2002:a17:906:2b8d:b0:a59:bc75:5000 with SMTP id a640c23a62f3a-a65e8e34d62mr31273766b.12.1717027400270; Wed, 29 May 2024 17:03:20 -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 a640c23a62f3a-a6351254bc7si219935666b.301.2024.05.29.17.03.19; Wed, 29 May 2024 17:03:20 -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=dV5ChZfz; 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 9A84668D3E9; Thu, 30 May 2024 03:03:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2100.outbound.protection.outlook.com [40.92.59.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1110A68C528 for ; Thu, 30 May 2024 03:03:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NvDEzBydSxbU7wIdftZAzQZ/oJOTt1Lh7rS7wnLykUdACsA9pTfG9vnL2UFBshD2yLv0ChrO6IvjKiL1T/FpvJRxhEUN0zam7K/pD1ghT1HltJAnqNqFhiRNbVufhYvV/X64ucrA3RbhTblv+darm81kmRzgqo6ivun61ULBpBf04M9kBAAvc5mxcIbHQzy7caWFnwW1DdfSyg0qX/LOy5+OHWBgvISKkTgsO/v5jDOUXng2nIRxnF5VMmPyXnzaI3freyCFUv8volP/t0o4n4laXQI1hW8+m9rREk86HoXQbpzio+eHVvEy97DCTaC7P6qDA3xWM5EX0R2ORt1Oag== 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=ZmEZIX9/t/kKqo/YxJcPWHkg/U9OBjLw+JFkrpWs350=; b=MLLaCsZYxrR6NZZQM2fwSMAzJzpkbw1G3BRoFVpAOAoSn9bsEffap8O1J9L+M2uK0Gq3YrO5j6UYTz4DL+8fz3U6v38Y+giLNr0pWtptvkyj3FtpTftnx/qYOj292Tj+CiuIPTS+3JP7MC4iQiLBzQEBr0kvTGfb5g5gwrMbVvlpXoFwNm2kVFTaTQSCNserKijMHJiMVgoAUiuC/DzOetba4ifvtdQo3bpWQIjFItyIr6NoAlECJP/fUs2tF1TbIqMd8Thpvvn6jVwhpppbhcISm0wgLXg/xXK4TmPSoapFDeCRl5+KVBWQNgUgXKES7UnMOhlnQar2Y5Ld2SS4XA== 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=ZmEZIX9/t/kKqo/YxJcPWHkg/U9OBjLw+JFkrpWs350=; b=dV5ChZfzMgHhV69n7WWI3wXDBg64kLy1MP3kZt3t9WHJGGjYTOVtk84e8aBCTaKA9hByqcfKABU5ytLNMCC5tLqFyQxFTgoAeDKoJYmf4vnGTvqWo0v03CbboVA9C0XzgzDtNP/8wnvCtP9oZ8tU1xqMy1v5kGpe2+50KQR4R34IsSwOhc7VLOUK22YXi9bcRWWObm+R8WIfgFrZrHRiAiZ4fIqfpuTZE+dom9CovUOadRp5BTXxicKq4aaFQr9vLBLnCuBfeG+rpPrVUYuI/5eGT+AduchlwiVIEh7a1IhZsNLvo23CoEdd0RsRb3bmUXotAF2PvQ33PbG2bWxRvg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DB9P250MB0497.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:33d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.40; Thu, 30 May 2024 00:03:08 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.025; Thu, 30 May 2024 00:03:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 May 2024 02:03:01 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [7DcFk+DDOcc/F40g6CTTDQfxQJkPM4m1a8Z98UmALBg=] X-ClientProxiedBy: ZR0P278CA0139.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240530000301.3584231-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DB9P250MB0497:EE_ X-MS-Office365-Filtering-Correlation-Id: 57b0b7a6-c6f7-4f4e-50b9-08dc803be34b X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: by7MmTLHhEw3yBpEUuWD+CvKf+39HSsxf0/64zpoSwMy165t/S9zPUscYizGVgS9iSN+2Jpy94gpfpg0M0XtlS9Bazmrd5Udg9vdh71X+F2m+N3Vw2RuoSKP9SSm98mMFCnrXkx/ovt6rzQC8ZcOdpZ/w2TxqbayFXu3Mp2Dk2Y5wb2KeUiSDa77P//IyMiy9RJoZhsTrgJaJIHFxrciMBxGFaBkRfMrBBVaiSmXdbF1p5N+HpHOfJ2yWKSJ3Ogschi+a2Aujd1pFjCEe0FBY8O+wrpAUzkl4aNcNvzRgriEhrUTnd5IaM+4WtdBGemSUMSXsmndg+gLd4xeIQHA0Rk3WP63U5GWUQVLu/vRb7pXS5lw+gSy6uvCEWdRzrLW+GpBJwc7XpbmsuMihsGvSExJfmvZfpsBLJ2G6YhnyYV64HnEEcDneepEu4EhVSwmd4Mt7e6qZC1ibx/8YWWu5D5Lpg/PY4X9xVWcTv3LMKd6yYWe9dBIAnuaB+7ubddY6im3FSV8BuyAm8U2++qoQYjzzaHQm4O/6iZV7uigsXFibW9VXsv1aYtFvZMsNFvEJjFqPEvzBwcUR1OhfUI7V+YGwwhuxC1B3GCBEtGuoarhqfkexgdAZEyUP8hIGFb3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7u3gp3VnbiDZDK+1+OxSaGAPS+WjtjVLo1OH/PiNn9IquJ6MFxElNC/to+wzynvnZhAQs2Y331vJJ2WkzoVWgiQIemecs0KB3AlyzEfBUiVzLQLt7XmbuZTxiTF7DtjwEB11dKp/7XEfeTSFtXOIYTSj2oVR+QOvPO8uacFY6zbggbbSkxKkZwLnZw307JODlqU9jKpj+DMDbDAlVd9nu80UzpTHvJVKOTbt8i6uEItCdQCRgUCWj8TmpZ7UJTnOwcpQdyx/EKRE2xDP7erhCeCnYtBy9MOQbZdCy2fK9vkNafJ7xeSA2XDdqD8o6IHnyRnhUmDooRz0r08mGnBStu7R1gUtN+TcufCFkoKEfVI8UPep5ED9sAgDUWY22X0w4F0uyl8ZXovrlhZqRJE9bvGaYR6JF/iFpFGOnVFXgAq4ph5//AnvKZiTnxwK6/yu3kI+331vqvNOg7yGy6D9LJlr8Izzt9d0Hxz5U/YfSX8F9nTi86IZ+U8FnplWhGZQpKWwutewOx1PmHdNPszEPvQDdLHE7kEx+pwPPkoESrKkrorENeJjlsz+w4J7QdyWjqcAoFBDQlLKQV6jbKl2VyZL40iwbk7CkhBO3R1nmHXGzD4SU1gfXNrSLhygC7PL+eppMJRDX4dGJUovafk8b2kWdQN1tREJrvBbthZVwXVfiLjbJkI5FWa1SM8AGPFRswH+xP1rvFnK1yrg1vP3okK+4i/9LZeGB1OR3mbRnf0ojpJkLzAc9gPcU+RO3USNvkFYY/RUwTZokX2ky4MLSlW010RHC7Md2MocR9qCEOhoOTljE6KR9spE/Et/gsupSs7j7gVD6+0cq0fW8Hd/QYkqr1kOvhCW61Gd1sOd/+7Tgc5jmh/XmxYvIBQikD3azvovevrEsK5QrW4/5UhVTvaxPaOpYBP4teH6Dej2Jy+YlGf6xTszXRQUerVpnF5EHkmL94ROVDvzRKpnRVPJqCpozF5CezFHC6P6RYOppX15cgS+Q6Kan0v3N1dHBRGMJ2VHIZaDVl9TF4bhGaCAkIk/7PZt+QCT3jU44Jzl3LeFFY9qhM3PHdCCzhjF1pl2KQipQNCkxaV4YDmNqPiv3XedF7OXo0wQkDE0p/jd+8dOfqHEty65OsHmjldaqHHVRb3mXhzR0dpxHfaV2l85V93Xh3HZu4xQnUHx4mXkbk7flYZfozl2/vHm5Ch65LYJilBpddylZyC7jyA4CkUy6vHd99aaGT2yt0c47Lc9eodJaw6y6XPqpdYHRumCFkKdVDsdWc49ejhEMVYrAgvJ8A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 57b0b7a6-c6f7-4f4e-50b9-08dc803be34b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2024 00:03:08.6458 (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: DB9P250MB0497 Subject: [FFmpeg-devel] [PATCH v2] avformat/nutdec: Don't create inconsistent side data 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: +kqwYI0ZgSDj Forgotten in 65ddc74988245a01421a63c5cffa4d900c47117c. Signed-off-by: Andreas Rheinhardt --- libavformat/nutdec.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 0bb7f154db..a962576f06 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -966,17 +966,13 @@ static int read_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int } if (channels || channel_layout || sample_rate || width || height) { - uint8_t *dst = av_packet_new_side_data(pkt, AV_PKT_DATA_PARAM_CHANGE, 28); + uint8_t *dst = av_packet_new_side_data(pkt, AV_PKT_DATA_PARAM_CHANGE, 16); if (!dst) return AVERROR(ENOMEM); bytestream_put_le32(&dst, AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE*(!!sample_rate) + AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS*(!!(width|height)) ); - if (channels) - bytestream_put_le32(&dst, channels); - if (channel_layout) - bytestream_put_le64(&dst, channel_layout); if (sample_rate) bytestream_put_le32(&dst, sample_rate); if (width || height){