From patchwork Wed May 29 23:59:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49376 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp997347vqu; Wed, 29 May 2024 16:59:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVbudaqScmhj19Qe/Y6ILG2LmbuSESu5XQ99XSEFA0/IbtW2+LaxuqqKcI8xMBH1m6KcHVChe0jt9/lXYamPql0TSm4wNZt3WIHTw== X-Google-Smtp-Source: AGHT+IEz9KJkN0q8He5oFgNlOeiC3YeEUKTuljb1JpnwO+SSFltIwOvLfptaX55z6AqM4EuehWa1 X-Received: by 2002:adf:f74d:0:b0:354:fab6:3103 with SMTP id ffacd0b85a97d-35dc00c64ebmr374460f8f.60.1717027162434; Wed, 29 May 2024 16:59:22 -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-a626cdd0dd4si669736266b.925.2024.05.29.16.59.22; Wed, 29 May 2024 16:59:22 -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=YzuX5vIA; 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 25EC868D3FA; Thu, 30 May 2024 02:59:19 +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-am6eur05olkn2058.outbound.protection.outlook.com [40.92.91.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89D3968C0E8 for ; Thu, 30 May 2024 02:59:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TFMsKqxk21rM4OFAv3ueAKCNie+Tlc0j9jRXyNo77EmvfhLoagLyPIi/oui1IdSi7jSiEnJZ5EHS1ygbfK289p2fW/Qzszjz+MCxP2HTmxMLQYIT2QJbx9piA0HGG18Jld5wCIqMQ8oqUpd4ANShv1z9G7vf9KwvdZ4s3z4gkf5vKjKGsLnSUPtcJNFAVj8h5ccVNxQNQbzAYhE3Xclw1J2QWeATniKfsRLeXVqWGukouCUdTyBdwV3czbTKgFGBIP6IVY5msyRNtuaHXhz5a7DWyWewdHZ62Rcep3peer4Vo3xFzRdhXvmIr9kNOUI/gf7pCn2DvcPxVtgsZY6ebA== 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=z1Qv+AvPnYlT1fozwFYpeTc+tjBuDW3hTR95wM/9tqg=; b=IXO3c6CZXHi0BkJmGqvJd88BN5SOfq3dg1rQdlw+ccq9xUABFwo/DbSVx1b7ElI+h2YU7RF8qwByCB5Z+4V0vgZMVCsRA7MzjFj8Jz8AmwXF0bL/W+jbEZ/YGtXf77uQWgGOTdZmNJlKB/mqPVaYH25QbGEcgRqgAR9+YLs2jN/E7dML7qXb5kTS/X0VYrc3LXSet1597h3cwhzfs57S4riLJ8BphcfyH/3nVDTckVuX0JOnUFuQ6kOQMijr0D6kfklqZg6zKhJfjbbUbB/rxMpCenZBGL7p97NjlHbyraaYVIHSapqm1IJq1JT4Xu/e8qvHl/JoUj5e/RCyWIg77Q== 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=z1Qv+AvPnYlT1fozwFYpeTc+tjBuDW3hTR95wM/9tqg=; b=YzuX5vIAVIHzX3pGlwoq13bo8ciFP8gZunMMcAL+E96xUYbioFDy/RUFqJbkXKzCHu5L86c4WbSn9aDfa+Ef07/F1d0AGDb570rm4n8+EWBb36p25mgz/J7+YUvC/5anFhxEVYz9VF1zQyD7r13QZYOeroFSxVjc0JJ+rkeJ/GlilZYYlTkuPZLnYAO7edNc2pCGiZxad3vpeSX2xqS9s2Sepx7JAQLQLhxNQq8D/af9UPCwGNg53E0wAU/GwfW4G7ALNqjKDrsfXYzbkYZwjEy+9JvMSBoY0uFnyzn9gA970qJHt+tfbuoJ/uKHVsUJ1J28D/Jj5vF1S4II6fHm4g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PAXP250MB0494.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:28d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.21; Wed, 29 May 2024 23:59:11 +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; Wed, 29 May 2024 23:59:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 May 2024 01:59:03 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [2ZOwip0L87p54nqeAiCY7YUCR0u3y6TDMhmRPx45meE=] X-ClientProxiedBy: FR5P281CA0018.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f1::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240529235903.3573664-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PAXP250MB0494:EE_ X-MS-Office365-Filtering-Correlation-Id: 09d2d924-4670-4401-c62a-08dc803b55a0 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: al6iOiRzIpc32+XG/jTBk3rRAv0Doeh1ASNgYhWrbt5vYIw+jV5YLORzLhpen5oscNth8XmiFuUzwzpYyH7VIH/GL7NI3ASCB/2fzgnO8dQR4UT10HtjH8pXXRu/Mpj9oWE9/GNR4r4oZ9boVvIX4bdokIFGVa4MLAamRIVUiIE2x4e/pbO7qLq43PojQ7RK78ROdMNtaU0eW7OZb0hkvDHDIGrIU0M6XkxqcKz/JsGSPaocRXsmrJO1bI90FFvvfnQh13uJHZj7IqQ/ptBPZ5gfkMRcVsdXCGtqeUbiDT8FFxKaMkrHVWnJ5JLfly6eO2z8UFXL80BHv+1UBpIcklwb6xLsbD2W9UAFKGye4LxXDRLcd3iDEOwM4vApLO2OzrdlMLEcWD7TcSzVUdXTYpW31MdNzfPtr4gvSKgXR/rmTmDvLEztovc94uvZGA79LVmOaSDY8i6P0B3hTX4NNvUAuRrVRCEZSp6VmKKLp0zs7+Nai4HO+M0PqAGNlYfABFHEzwC8HOO+VqTT6WYgNjVQrN1Jpx1pXfI0LZiHGDbKCarcgj/zBe/ZTggRBdFFse+T7Z3Jz8aEZUhjF34VXfyfQ5yLymSCva6yUAMgWZXDvxnfYgSROkjrZVXs9E2V X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BsWp5HkbXwNLhuePWPtkPmu1Cz5/BUDqjFlUmLlbq8APQBUBlqutQfUl39zFyADfL87Q6Lri/b4GXXrYtGb8EAj2A/d+wH8nVaCwkSa+m15XvF0F3myUZ1nvO2mGxAMCT7o3Mu1pJXdCwkR/XgECXRgZlgUmrd9bmwgtyXuvIF7MgG70aSbtDmgpl2+l+4SJCdQegUR5nA2t3IQgb/zClLV6Dtk/vabVCWIq2k3K0mGoD0FnObjZJRkCjsU9KcDqF7qwIkMxtQLnhttFjy4g+Ia8qCpd0pqKxBrPynGpbi8rEg/CHXZC/PhH+/GiJUzo7/kgldI4aH18+TV901TdewxItweozP/dmUs/txT5msjF/Ijy7cLTmmmPk17IQ/+cmQk4HCgkI69U2juXV2PhJ4RwoAjrN85IExOILLmPj3uK70WoRhmZQDgXxcTj3vS+cOIyqQzhx0nkTcQBp73OYBwalyiOLkK6ogrvktfeXl6j+Wt57VRV8St8KdmtoQzLbONs2Egk9nOiH3cOsbx0BWZYrSQOM0JOUCrhF55kLxI+OjikqB4XXPlH9kt4jqtkPxsT4HFJqFv+k82U1f8LUcZIuS9PATgUbq+qRl9kBhfERiq6jY/jiZHGcoejmNQaWjCRfnXMsG8tAlWZUo39hgFwBAOdbMtrqrkHVvyOZp+fTSeahimh0anjzUxR1yTVYPz1ewyAxNKXehs1mCOgpsQRPShMkHMIRTkFk/bjeW+sOOK8tHOPs2adN7zxyWxISpq67PMmJjTvMq43+JO1+1MTmOln5iTcPqh83CcB8q7nWJlKaCZ5yPXT9Jdju6vGexRaf4Fg/E7xuTrMN8eSf6tWrD165JsfHIJQMDza7nxNLS5mrUXSQQQHrshTZVjpberUU4eX/EIr1Epd0sgZNPGHHaoAE6yTSTfE01M3iHkayyPFeqnz7+JaSC+RENiBsGHJky0s2U2eJYBirOGEIoaDdggsME5MSvy4Wp/R6cBHSa/h65L3lEyLkAQNIKUTZYOGumA9BIJw1o9XT39X7v4nKigumdrxI+++1A+oQ1aVHycXctPKvPb7iO1U9B1cUWtmstM9U3Hmh+LAq/w5AIpdKKgbsndeUFETEV3XCdWXpjBrGgNQYOk2vMpCdhfmKUtDkdH4NvN2E7qupMoUdWOCjq78TECvDMmwec0Hc+NqE7P6bAiea1+PJP7JEEec9lYGQP4lx14NTdIIW+5r6Kw3Fj8Ee35Q+eBIDwIP4NBWePgwFcRahLZc81wHHge4layix5TK9exGi0rTJNSbZA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09d2d924-4670-4401-c62a-08dc803b55a0 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2024 23:59:10.9725 (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: PAXP250MB0494 Subject: [FFmpeg-devel] [PATCH] 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: IPUtCK3YPpWA Forgotten in 65ddc74988245a01421a63c5cffa4d900c47117c. Signed-off-by: Andreas Rheinhardt --- libavformat/nutdec.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 0bb7f154db..94b49d3eba 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -973,10 +973,6 @@ static int read_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int 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){