From patchwork Tue Feb 13 13:05:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46237 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9002:b0:19e:cdac:8cce with SMTP id d2csp1277865pzc; Tue, 13 Feb 2024 05:03:45 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUisWPOrlGQjijHdSvoYXHwJSeWvBFUHo4NgiTLC5W0ZC7rxnP5np/MUNQFO1CIpghELkodwtLRKj11iZUgRTp52H6ah+4zl3padA== X-Google-Smtp-Source: AGHT+IHozl0fSd2QdSJFgISu7N5MWq9cDeqVnDfHoy0GS9tcO+9/692SCp36C5JI7q0OnaD1meSX X-Received: by 2002:a05:6402:514f:b0:562:5fc:71f1 with SMTP id n15-20020a056402514f00b0056205fc71f1mr722432edd.24.1707829425419; Tue, 13 Feb 2024 05:03:45 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW6LcutqvBS3zZuBiUwI4we1q+IuILQQ1xrfEgPELB0iiIp6a3kC6v3A354AXPNo/sTZnslMiOGv3IlCBns41U65sQrK1VZ1wzwm+Wj/U6m05xbQ2EAMXIAS08a4syCHy47fSQsKXG9lnrcSSBUzoBYGKGBpVCsOBjQDuHlPANxkkQtlVpyCIwj/0PX+cSgAh3QYrOU13/tQjn7tv+8fZfC+2a+fwpNdM3/yrKIZYsLUEekyYaPMB6C0YFF5m7IHe0IibnedU8jdWMjBmXZAYn7BOfbiLNXDRxOvjpwZQSIBat9AjUu7NyfdE0IHFQi+EJ1L8YErMTs3hMBY89nNVaqEp0WpI9RRwasYTPnPeiAjrqHVU/deVdqaffN9YjXNAtFimO4cIs59ysmexQvIXy/3UMbf84T3BDxutq+4PuWgEgRK15HxhXcHSPIzk8Q7PxlbsHWnf6DfeR3bzvefVx05bnIZEJNLrYkpH3pgrIzeX/bVtEOU+oINyQTlsRMam6DtoTtQaMC2LY7LLgkzg0firQjO2w6BGK48w9loWlj1QzA7/7V3G7bAIXC6qpO3gIpTP9AqVkztOnOj3UpxeTpKHN1gufFhSIPNLkP+UFogwUUApcLenbYN6lOkOR94uSt1mLWH9CCGnQFQgd//9azYqNS4608c0tCtPsZUtwYGn2K58KyshWoHPXHzjFtJyBH1rh4i2USgnxn7f64KKyVUqyu2rZcRLtlY5ibjzcf1B5QXw7cHHUyqQGeobvzn9G+up6hm3zr4RmnZOQdex8EAHMGdgcVp/3j7FHtUnkPGjADYvApgFXrvBIAW318UEiTxoLIFMtzXl8YOQCMX8Gdtw5Ghl/3JWzrWBoaqQP2CYlAlwXTqH995hVanCCXDU5AIVmpUmvXZz+bDgKqg6dXUCi0B0Tu01Fv4EZd1DkCYPpTTnBBMwqo48jjbZVSYS1NSJ 5I9Mfs1hK9vZYs9YiNNPUjw4NBcYFKtphUv+WcLZhRRxtY2dcU726OtsXUporIe2jkndHG5eQCx2x8edyo4QnhZ8Vh8BcHxrNQvD4JH4uS+RJlAMlwwoooySz2F8zKUHikeFLpVJJu2M0Nau3+uVUQglEUEtyIDuOfWm9UEQ6aNoUSMEUZCBDMghysXiCTfD9Ncw5xAWVKxATrcvBHIWa60wmC0sild/V4ZUXhNYA4d+Zfi/2Wq+hslmD4Bb60RU2XZurwGd4jijJ5/CszfWspfXXu6UvAYwFx2WJNuy6GxIRMIGoFlpzqxxEt0mlDMWSnwhTThauOTzoz38adxMKJbINQfLEr0bEXiO7I3PZC9Z0Y7guJY/k680zto2Ehvb4wVwqduQIcqdC0Uj4iSZGM9tHkCOFRDANIJcM2sdgSagw4wCeUXGWIGbEcTXFy/a544++W9eYf3UVoo7S+QzjTcaEOdUGLzEY3c+e+8/UWcM+R+tFNNyQtNO+UsliyFuQnftmePHq9yD0dbglRFkPO9UqdPkv7f7xnnaegIonGjayzWN4F16LlkX/0xe9lxOSLFnhxGTsOLuxajp9p/RoDwJXqopXe07+lPaMd Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bf9-20020a0564021a4900b005610e7ca34csi3786419edb.487.2024.02.13.05.03.44; Tue, 13 Feb 2024 05:03:45 -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="r/TAOW3s"; 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 A3EA268BCBF; Tue, 13 Feb 2024 15:03:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2033.outbound.protection.outlook.com [40.92.91.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C741168BCBF for ; Tue, 13 Feb 2024 15:03:34 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DBc9aRRB3xRTvclaPbMpopMBe/vX5yc/UoevqnadDWzHhZHOi5s01IIs9xVT9JkzjlZO1EuRFA/ajAdqcbRkt61h4tYcGAg8Y6e+Z7e0sVYPNhJXHLuSWWMQX37r0KhobuU4AkYMGHdaPajoDWmXHyuYbXwJpEAwJlRtLRQCwObCbu6PX3NYcgHUstkkT2HSw5kS8pDcVhQAxfPxqHh3w4FHV1bAgdjL0xPiNOqpdVVo+VHJUPjrp98HB77sBHAQvGG8eiY8kT73peSwl5wf2Oeyeo7WdiTNy48POTgbfXsvm8ZKyTd6H54CkTkNg5Y+iwM7/L9iEg4iyuwNK2vMbw== 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=XWwYl9jD3CAT0AzwTlIga8S4aii3w3ZfITcAba8KMT8=; b=W/BqbfxPiX8tRh6SxokatfOLSf2W9nG+T4tDO4DPbvTUCJVr5P38JJIi29qijLOKyWtZ7zhEejEKSBrd64Elk5Z+jZlisHbIRYI4BGrfBhUnMRIIcb5E5M1LyQAaXYkKZPnqlQc/jxrSgt64h0HRPm/F3u6tK23dwB9204mTniyVF35Zl1AIBnZdE2/5AzSgGETVYRZ4SkLS1bt+X6dr8BSVS1hhehelpn67Z6noizNowodoWkgEvdZjYggQ7PxKOdfRrd7B73GW+Ogx+zMoL5y3bBMHPhU6MhTxGYMogGx5nw7OVHcjjwdV7COt1RaDHcTUM9ex+Bu+JTjxA+ucKg== 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=XWwYl9jD3CAT0AzwTlIga8S4aii3w3ZfITcAba8KMT8=; b=r/TAOW3sBNKD/LHF4QWKDLA+9RPgOMLWyTcJGXGZsYyYHNBFGlPBkZzsLSmVWJmZ4xvYGOtpX2e5yxnxurj5q/AiwKhoWf76ARIyRjaHNBn3Ahfq148U7TZisgxcUVlJEF4jB1TbA9K4WSHcGDtRB0PF0QKCgCnrISzgDYwRhTU9eLkvuL/lrGtvRbEUOjJUd5CVkzx6ck/Jl1CB75JDkQ298qLPCUEWhNAqUvsVD21bKwe0IUwvHlDP6IBHvOPHjeMzMseuvzfFkNIrVdB0LQh2L2xw+DU3ZAFaelywXl4UgS+syTKD75kchFgARxRYioL1t5qOyDaPQ2fEBvOIQA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0023.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.35; Tue, 13 Feb 2024 13:03:30 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7270.036; Tue, 13 Feb 2024 13:03:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Feb 2024 14:05:19 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [JaM70IbAaqCVXMN00KFb34Wxs9TP/KXuAOBfuwUS8HY=] X-ClientProxiedBy: ZR0P278CA0146.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240213130519.522242-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0023:EE_ X-MS-Office365-Filtering-Correlation-Id: b329bf76-5e89-4036-7a64-08dc2c942d3a X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7sFPoTip+1OKTfT4A3RyRCCcbSzZwUHPwY1QwzXH+7QSuRgqG27w6hDQhpApl/4v4+dNfZxnGAFUheK76X501Fap1aEuLaFF+nMSFVGvklXm2zqku+igAGsT8Pn3FUAC0j5ZCFvnm30yDa2FcCl7CFDzT2pekrTwVsj47U5MRKnbrOgupkrWd5MfRLCJxxhCjhLXXFD7uof23G5P8Uq6235Up0f1FwBwBWcqZFnoGJvzLjaPZgW3KXiWqZRKovufbYMTSzbwxJOnPbO02Lx+sAWRneoH4k1Nh3qA5HUfxZSJ8hJVixmaX7+bfo7ZaI8hiAcBHTalO74LGNI9e3+RqOEgfNtWJRdhi/Dda3yes4aPTucKSpBPlaiHCp0bKEygTtIVGr5EZKFCsRzBzFTB2VdfSUcaR30zIGJWqsfFBT8nuNhOeH2t9WSlL9ztRhlqhwz4gQWfj3lX5hMuXA+Cg4UoimqZZ3LHYJ8KuEqCnGORnY/WPk/8v+aDKo1gOQSec+l9q0KMD4OzTjsaP4MalnuRcQNw1qasIchyBlX1nHLuCpYRLaKBcK6ICzaprGKIUZqruWSpstP5jxSuskZiz9IgQBXQfumPFd79TumuIrwUYRYhmz3S44MQ2zO5R8fo X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cQifDfMp9XD8i/UCOANdEPfQZ+Ue9Wu/HVM8XKPGK2y6jDhmVGyiw7lE+srnt8vl0fVbJ5SFrgNeNB5V/evuVR1W+riIqee1DOU/ktHTQoj7q3DlBFot97se4xNxryIM8HOzk29kCNWRkb/ZN/YWkEAHZID9RqiVoXxlzt5Zc9aVazKaMhhd5vIU2JSCFcPn7W4aF/wuuXfeJRe7+XHv51zUlZ72WUFON8pF7GOmD1dmDPFTs2a6H7YUqfjXKFqBtdKLx4+zt9O+72ck08q/WXFWc0iEOBH1v+7Vb0yUtsv5qW7mH2IpeoSmj3bx+DFGgB+HkILndKeLzyWVKrQ5ym/UuRVKn65mSghzxGG0lkIGhQ0nvzhAQZbKW/iw6eoRJ+JoLBO5d0bGhdqsViTo4eMOpeagWV2EKwNRhE9cKmpU15x/bfy7jwIHAoY+DZ6pbPi3YFdWKafsnnJ33lBGS87UJt7PxEvZ2rsevNR1WCWjezlR0yWsjhRBAoXqidNmhpj9usDOLaEeVeWr+rZodwkfx/Ddf2ssIedlYxftKw4IDydjMMmc1NlEG6O8PElW1kWdQbTfkuMTiMFVKDT1ObNXEzFH4kuVnZAgOuSa9j1rJgHRpCQO2tykiKqRbzyAj56pibD0/ncQGPCbkXQMhFVslqc/p5zNlQiT/hP4loJbc3m9QxusecyMEQSfnFtrs7farYU3rDqFz8NXLCB4MOmMYzMPd4UUnko5C+BAGj3gsbt7EezTQJVi0/zC30J7uAQCDRwG+ITGhQn2MzPXlQCZ9/+4Ujzwtnn+duNRw6acYf5u7nHyPGADJz9xN7jcM7mV6epqqxawfbo5V5x6e9wULDROQQ52r6qDdxoaHDWmfM82mm/m4Fhtc9CQdUk+An7eduEA/kJICHcR2633jaqRJgpNKOQ1yg1eLK6/IIDtsJp/t0NO8DznvYhoJzumkGMJx+c284exGmAXjXEe2lmDDW2jkyI4Ro+bcUadj8umBVMycL5vGg0oJO3yjTl3PPDlLE0l7OANnx8fo4dQymdfG8VlrMAEsmxZNXJtWp8rg2DO5xCklSk1VI7YD040yKuDlWJaFF9xO3YupkrEotlT94YIeq8x9226qOL1uHRaZKFM1uekSPrurJDE2IpoumGYmQkc4stCK5qnX+3dvJ57myDMvdiePJMilPfirNhgqkRVH4CA5f0Yh3qKzFDFdvBUJCmnqk7Ou05HMlGyMGoYJYLimkTiV9hbK4NwX8r2M4uPjsG0IJq/RIgJTNnXBvTS260pjikbPLqLIumi4Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b329bf76-5e89-4036-7a64-08dc2c942d3a X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2024 13:03:30.7187 (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: PR3P250MB0023 Subject: [FFmpeg-devel] [PATCH] avformat/dump: Fix use of undeclared variables 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: XYtNcUANuLTe Broken in ec2036454bcdc6c12382961d4ab539c2f9b70ec8. Signed-off-by: Andreas Rheinhardt --- libavformat/dump.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/dump.c b/libavformat/dump.c index 9bf1695d96..42b1909bd7 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -685,7 +685,7 @@ static void dump_stream_group(const AVFormatContext *ic, uint8_t *printed, case AV_STREAM_GROUP_PARAMS_IAMF_AUDIO_ELEMENT: { const AVIAMFAudioElement *audio_element = stg->params.iamf_audio_element; av_log(NULL, AV_LOG_INFO, " IAMF Audio Element:"); - dump_disposition(st->disposition, log_level); + dump_disposition(stg->disposition, AV_LOG_INFO); av_log(NULL, AV_LOG_INFO, "\n"); dump_metadata(NULL, stg->metadata, " ", AV_LOG_INFO); for (int j = 0; j < audio_element->nb_layers; j++) { @@ -708,7 +708,7 @@ static void dump_stream_group(const AVFormatContext *ic, uint8_t *printed, case AV_STREAM_GROUP_PARAMS_IAMF_MIX_PRESENTATION: { const AVIAMFMixPresentation *mix_presentation = stg->params.iamf_mix_presentation; av_log(NULL, AV_LOG_INFO, " IAMF Mix Presentation:"); - dump_disposition(st->disposition, log_level); + dump_disposition(stg->disposition, AV_LOG_INFO); av_log(NULL, AV_LOG_INFO, "\n"); dump_metadata(NULL, stg->metadata, " ", AV_LOG_INFO); dump_dictionary(NULL, mix_presentation->annotations, "Annotations", " ", AV_LOG_INFO);