From patchwork Fri Aug 27 14:27:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29812 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1512311iov; Fri, 27 Aug 2021 07:28:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwP/ybXvUKcIOXpCMcobN5s0H4V/Aivg3TUR8dKBsXTPqR5hFr9CYtOf79yeL2yurrcQOd8 X-Received: by 2002:aa7:d40b:: with SMTP id z11mr10007429edq.224.1630074503319; Fri, 27 Aug 2021 07:28:23 -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 a1si6554172edr.277.2021.08.27.07.28.22; Fri, 27 Aug 2021 07:28:23 -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="hR2B0Mi/"; 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 1E2B268A214; Fri, 27 Aug 2021 17:27:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074082.outbound.protection.outlook.com [40.92.74.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 332476809E0 for ; Fri, 27 Aug 2021 17:27:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nQpcadghvjXAUnKzP3A7hUkJu7SECHYW3psMvUZEO9XvicQrfoEXk8DlzrbxbTlgL5OrnYL72e/kmW/QdGW3u9U0+0wneiKBuEZi9Al1EyYCoyQYtmrXJGa8hJxXzxHGNDDHIFVZmElwnO9zbqceo492Csub7CvSQ5XBz1HilleKWdYjQluqg21gqnrxAT6QpOCUV/r8SXJ3cRtUNQ4G7M0Bfe9QXVISaS7PgEaGjyuXdouKg7xtfIyMeGTh7dP6PWn7yK38a+yQaQ0GkF5hqt0aQ2+meHlcauyuU6SmIEL0XrnkV5IAWkr/OjgJ7OiVLWdkSVABaMV2adBGBvzHvA== 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-SenderADCheck; bh=bK+7MtGygnQjsX9NIiqfLXEBvy9f7EPi63UM2O+TVEI=; b=cbQJyitOyPvFbPbWgOmO+BNmii1dCyF3oeU61qk9Hnhrifnpr1AXSSmWfLTyeEM8IxlaC434kh4lHDIikxRaSHLWBqUsENsIfR9N4KW3+tBBzhqEgNHdfZI3p0qXlGy3ezOb+Z6KLVj0XT6SbMEGUJA2LJJjVkHs2WOQURw9XpqJs5EvM/Znp+62A2ZziPj5XbWixwGsW3vJClOKawuJCZPQstspGPI/S2X4VD9STxynpDwXSidFvunMBmN/ZHpFp5W1J7kJbnyi6zA23Nk9a3C7/rCqUSETBofYz/tezKHqp0IQfvk7EnjQ7EVtUu3bXNbkd9IIaGJphVoXB2HLnQ== 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=bK+7MtGygnQjsX9NIiqfLXEBvy9f7EPi63UM2O+TVEI=; b=hR2B0Mi/ii3HsmSM0IGARWA6A6seNUFqH5HZcF9LQi9macbx2HHb48NX/4xFAkVHE5O7pgVf2kM5dprgiUZXcaidWKRdsyo8bRmS7KpzQ8SdpiLn1RSGKx8mNDkb5FPMuF2aupyHnuEUujOnOjA9iPwenqg3UtN2nyN4ys27GH1IRdZUC7xwHhEZV2EJqxxZ0GODJusZiHb+15z8fV7bAM1XvH+uewPe2nJe26DUr+/+gOO7EKJa/HXBumKeWVOiDYhtRxxWAP4dLscfjv96mzBuJE1EHS1llK5LFTUoptlRTLvkpeosoKiGTwCbfs6bqopu19k9LipqtBAWS5UdoQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3687.eurprd03.prod.outlook.com (2603:10a6:209:30::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Fri, 27 Aug 2021 14:27:40 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590%5]) with mapi id 15.20.4436.027; Fri, 27 Aug 2021 14:27:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Aug 2021 16:27:05 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [G/bwsN/R1Ur2pkcBk0u1JKpUMsT+bO9s] X-ClientProxiedBy: FR3P281CA0031.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::9) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210827142725.645653-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0031.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.10 via Frontend Transport; Fri, 27 Aug 2021 14:27:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2c8001d2-33aa-4cf6-92cb-08d96966d307 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQnUOrjuXD0ZUxXZpiaS0/7h4qpQ6owituG0lcXzi5lqtpzuLYE4NzlQyyLfLgJH3pIwOUKPtersGn7mboyF2h535BQ8oMO151OeIlITAFjEKzKytYyXpl65VZ6eaa3CzbF2SdDe8FXpg+88EcH7HNlgQIXC2hjlY3WYLaSsauHxbc8X+iC0JwdcsnoiDivuZbCNKe8OoWn2L8kwwQ1Ubn0aPQfFhGBF4RXLoml37UTKpp1Azm7Dq+u4UvmUrgihq0/7Ibe3PxrcezWGKmRLMHQ96hsNArOhuB+BFO/z9fWaxpD8wM4yziblRMtQ+z6cUCxICqZ3zx7ys3g0tJI4qtPQjQnQ//35MO4ZTAWAD/fc2ZylaLXpxsebtYwA1d7LXO/H9vQdnVctgHmoiNlpa0q4vhonq8a8pq7o08/fRkTqOtqfg+C+iYb9Ame+WUdUhPtp29fODjLn2qrmJ6IiYcdv+Jo5lCPbRE1FpQmXshreH3JKmrCzEq9XFRS3LxBBcQNc40GIM20JNmz3YVQnd60PT3tdDiszBj5+2NeNR1+kT8LneXmyacs6bmWZmw7pRJxRHojatGduwRCNAw0Z9LpfVZsrdRZ6lyg0MNwEy3KMchAQ3ACBi/mVhXRAct4FKntp46AcSZkIG/cTD+qE34MFjrmFXSthwMf9/hH0SSYe6bSYesz6NBgKKGqSdVyfoLEFzkMFrdM2bPhbKZZTIZCwlmPocEjEBjy5i2G7B9cBlG6gn+3B8bH8Ib0gQQa0t0= X-MS-TrafficTypeDiagnostic: AM6PR03MB3687: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4LAbD6SCE6rJYSxwm7KDjrl7aBVly61LRNTsbF7jRckAigRrosCN4h/2alDQXS9RnixsQ4ppHC0Io8STU9oWJAGtrIGdVNb4k7QqYTxW39rtEm1+TriJlTZAgSS5B+WrAXd3V+4vHrqT5zkeb4IWertFxwK4cjPHAIAfFiQS1KP8TBrmtAoDooSva5dFooh3U4i/44ve1/uYY6ENJ3MTs1a/bacdJRAO+tZfEt+noemLcE4we4VNH2GoEDKWTpzrBbEO+PDs37uJRwjYnlKE8V7YI/y26d63+DxZkRh4/UIYPJWtzhMGoAivjRfAHsqoxRhk1uyzQsDSSj8BNXQeypaPfYAI5s3otwDbvVec+foTiCQY6ySnpbvRjjZuAPzACXOj/rTvLPcal/ascNt1vVLXZRQiuhiHYSc47JhvkkXpDca1YZdpLkS+/8MkRvcp X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: //ty+I6CmxypTv4e8K2mZj8PKhhIuZJ65Mt2XA6w2T+okisa7u2JIIMRvrOzxHS2wS2d1vagGpBzSByNzddGxr6Y7vDAMvzlsaNMHZhPkWNNuz/hCkDpdCKUTAeW0OyXbIkfqum8tyQsfjpr1b5YlQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c8001d2-33aa-4cf6-92cb-08d96966d307 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2021 14:27:40.0204 (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: AM6PR03MB3687 Subject: [FFmpeg-devel] [PATCH 05/25] avfilter/graphdump: Don't silently truncate channel layout string 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: wqdvYCW4U0ZO 64B are not enough any more. Signed-off-by: Andreas Rheinhardt --- libavfilter/graphdump.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavfilter/graphdump.c b/libavfilter/graphdump.c index 22b2e21559..cf3296550c 100644 --- a/libavfilter/graphdump.c +++ b/libavfilter/graphdump.c @@ -30,7 +30,6 @@ static int print_link_prop(AVBPrint *buf, AVFilterLink *link) { char *format; - char layout[64]; AVBPrint dummy_buffer; if (!buf) { @@ -47,11 +46,11 @@ static int print_link_prop(AVBPrint *buf, AVFilterLink *link) break; case AVMEDIA_TYPE_AUDIO: - av_get_channel_layout_string(layout, sizeof(layout), - link->channels, link->channel_layout); format = av_x_if_null(av_get_sample_fmt_name(link->format), "?"); - av_bprintf(buf, "[%dHz %s:%s]", - (int)link->sample_rate, format, layout); + av_bprintf(buf, "[%dHz %s:", + (int)link->sample_rate, format); + av_bprint_channel_layout(buf, link->channels, link->channel_layout); + av_bprint_chars(buf, ']', 1); break; default: