From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id E2A8C46B94 for ; Mon, 4 Sep 2023 11:31:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE3BA68C7D6; Mon, 4 Sep 2023 14:31:19 +0300 (EEST) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2029.outbound.protection.outlook.com [40.92.59.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0388168C7C2 for ; Mon, 4 Sep 2023 14:31:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dYLviv97GO1A93K4nzW7KN16dcmZwBkU/+vSNGVLesNlzYRjTIDnGoN91WboY3J7GR29NlcMgYclAstfTMDqdJMHtA+Kk4oGI+OCn7dXlaSHSGBQzxgfvS9L0KxTDP0NnTckrJhpUuXH0BPo1HBUb1oD7KtriDOrrf525nwz0lihuUf8DERh/PuXCL8ozWX71Uy+pLr4zzH07Bop7gStJ4uLcHdHCAYchdHApWBe6LqYPJZ0tatMt0P5mBLM/vd+CDBdmsCHsQNKGAx9VZ/O20EvSirNJbEDwQNMQRkzjl4BhNbAHBASCJ1/3clWKJe/iPVutsN3snK4/+9+JgLJ7g== 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=0UAGrfPAQiYBcUw+weqyFk+B7LJpCqxjVHEKZLLkxyg=; b=lzStp8ZBcVrI/5zdGu8BXgzJuJ0QhholVb9eSIc9PD9cA0+Zdri9eqnk2RO+W9VE/1txSGmAOtCXybfm23h0ZS93Af4yl7xUs+Y655YL6Yk4a+RbkRwFj/g5cJ3uJidke4ptvRwmOFZLWQIiyMJ1hIwDQD3ssmrpU0d46u2+7DTD//mZtH/9cZKvmH0dzghHQpyGKiB5dxyAL7cHctP0KaB39NINNeYAMKtDdkbGBZ+g9M6VE8khnIO3XW6u0aBCDkmEmW3KlaTuLgFDCVHFUb2W1NtA1DTSv6tm2zIpPlxF3UCfeVPhwCcCoLIyyjr34UkmBKqcY8fo8Lnue+nHgA== 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=0UAGrfPAQiYBcUw+weqyFk+B7LJpCqxjVHEKZLLkxyg=; b=r9ct1trUzjytuIwhQXNofZbVaWRpeRLlQT0i2OWTOLGZ6yePgof1EE18uQrfJFmO1GOuaoO4IZ58J6G5d+ztoNsx7zhIi/h+guYEr4OQVTg7j/fGkfreEpovWvC+NgfUozwgPglL5RKVQtPaudH8Hkuvss0/CDorx6bG0d8lzFn1302WNZ8r7yH2FjOtipqZqx3dpd+DuDaCxh9IFe4g59pPfXz+7G7WjlDRS8LSo4eRF7NPSPaWEvEyM9GJAP5tFUNkVJxe++ptB6F4TzKt0bD63qMb0O1uDOujdJT46V2w0tBQCnLUYpv+MUwYnLxUz0dtEL72upjsYAEjcSKsEw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0017.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:3d8::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.32; Mon, 4 Sep 2023 11:31:17 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6745.030; Mon, 4 Sep 2023 11:31:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 13:27:57 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [bDzX1GOiix2p8+NH4HOYhbdkfWXJlnA/MVeZzW/mOFo=] X-ClientProxiedBy: ZR2P278CA0078.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:65::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230904112759.2652347-17-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0017:EE_ X-MS-Office365-Filtering-Correlation-Id: d0f6b765-1f68-40a7-6634-08dbad3a741d X-MS-Exchange-SLBlob-MailProps: 0wLWl8rLpvtlEyItUpZmgfjbRm+zWpoM/HSh3jvcjNhmuYTshuU8xFTorIi2/3fAwrm3/ngklTs8QYm5ztqr7krYgt+uQb7RKWjo76Lm+qZDMoazijCdS5OtfZgQ9ao1DDtem3/EUv8CuilfYj7cXj1jlipJn0S9B7mWC4IjVBK+tmI45k21AyzxpX6HysJht+CO/lvxy304wbmkjmYN5nKXwLtFgXCQS8w+k/GG5ToJRM6RDpGRiKeQS6D03nY77g1/0cfSHtXk1W6lkp4BdF93UaI/XNLd5e1aHjKeWOVk0raJ1kyKaucFE2+SiIXE+cVO6fclOptB9G/CyCzfhDsjRc3rkX1BY+RQgNwQDu90wGp0hDLx1grWPkJYHG2zj4WXkTFYH/uPZy+Hfjo7bpPeE3kfexB3HLIVf0a7uP8qORHtU89Vv7XMippL8QEDUWcn9ZVgFEy5KxoHgeN9yHZPrpQyW1Qzrge6IaYKLwsPXbnjl9y7iEqiCfH0NOm7AeIQ8ZtBQ9eDXVUHYac4wM/saMuATyUwteBwE6NWKJleJIC2Y6VBEWFzbbj6oYlXqz4+Ox9oszNW9EdtrIXimJusr6kGx/5EuY1piXajMRbyDgRJB0PJNvl3yRfrzEaQDMHenmaLycV7rmhMNq6MjQNZRCY6SamKCsv3sSuaNC+GTwG29pvIoUUTI4zEkdI0jrQE+RrCepGhL7JaVOdAwe0jDvTmnXJWP/0iqUw4up77MF0Q2aJ+67O0R0N35RtX9fS6jIjBNIY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XjMOjCCBPMtXiPCJwUX7Tg6CyECgxhmMoRfnqajPfncS/mIh7OFwibTJwWbSuKmHxOu3YNAJEK54DjF5Qq5OxIU1mNK7u8uUObgQSkUTJpLh5xOJ6SKCODIFC2kCypQf29tw4x6KkVDkfzkf0cvcd2QqAJRHGyYbPBTdgMLC8k6/eTGKGc0x8lHpczjOuQLDiFeD77NBRV5zLoTr6VBcANTBX21IXVDGYxRj5KJeZ+2Lyy3cbHMxYe1G7cbdBU5nzZjeWrkoAKqopXJlZANbbAzp+cTjYhbCjDoA80K8EnD/MCl6GZoPKBl0vGFbTDCj2ryfCuob/G7V/xJVEQ41Vkgl4GYFGKieXTMErFXTvNOXiSircLBm1W2CvHaUgfPKLd1NRymEpahq7bpyNJ6WOzbQCQb0Bq18eZszgkcgeyC5HIBINW8+iz4+teM++CraUjlLiASguh7VmYFrfiwma1fQwXMdlbW23wV6LrxLjLtSjcLqRO1GOaBqGhSQd4SyLHHeaTEIsm+Reig9qmd9ZM0CruBb2vWXV9mINlqUqpvvqhZ8PqOKXEmR7Q+hEHdbjmhKGBffZiBrWB7Vcm2ybtWmVRqLo+i/y3qpKcL2iJI= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ixlaMzGTW5atoQapUy0ovBK9I+YJzr9sdi8DgKcdh2eTvPzFb32Sjxv7oP8d?= =?us-ascii?Q?Sl9jNrHJRv39Ekh0oVtV3T7h8Lm5zdxhO/2rtLdHXltS1ta513qh/Y9oZ0QN?= =?us-ascii?Q?wvMAzsfBbI+Fet+fHITazUdoobueyU57BP8Vs8tQompMkQFNx+9YrgTFB0+V?= =?us-ascii?Q?/1UDEYf+N0gXT1NICYrxNvn3mNw4NW4Vjfsq6wwlnYITvNZ0MzlcJJ5ahMLa?= =?us-ascii?Q?PlCzpr1wqHoHEkHLsVcRuNkfoQ93rlHHCbc8lMlsJ5S3yVaBufOT9gSYvU+1?= =?us-ascii?Q?C5NLCPIIM6z+3aeCN+yukIL0WspHLt3gPqKiPGNcY+BTZ3jK4HgHYay+ngqw?= =?us-ascii?Q?e78JxkohcUFZFhIy3f3qQkxIOfZuXahkvJHXeiRL/TBndwXhsR2Ag0NEbyCf?= =?us-ascii?Q?MoLsqvUXEvWULvWja+V0qzAwAbwDLKUk0T7glLjkui/gFERRKiNfOzT3gtFa?= =?us-ascii?Q?4gacSJaKl660jyfjc4qual4mlU/rmVzdbsLhgfFuvGTg/8uoj4yunsI7fm4i?= =?us-ascii?Q?jihQgwwFDusoaTFxCHBkDon6KRZ/2KnvhFSUTLKy04K8pGWLu6YPn5vl1Fpq?= =?us-ascii?Q?/rlXLVL46AktDphsBel3KEDnhN+tkrVY8c7AHLbAPzJ5GaQFL+//DQKvs3gB?= =?us-ascii?Q?yf66vL676xe47eaJMTZQA3yvQltl8hs2GWJvDe354DnQoJUGUiZ7QfJ60OSm?= =?us-ascii?Q?wmYw+ljl5ttU1RsDNvuvJyBKk7tbdYRMF1G1P/Tw+nLOy+Vg7HoT983Cvlh2?= =?us-ascii?Q?XUPfwJdjJVC+bo6mtKDrLmSwvCBKh8PrXt88M267G9Bf/g9mtOfVcL8fJEoH?= =?us-ascii?Q?LYKb2ViRT3+xN13Iu6MYV8OWAawfnQVGk1JJmVaXF8a4DX5wwMIdXxTDLOt1?= =?us-ascii?Q?2YijV2/OPqZEb5sJ3gKFOwD/CvTXb9iWWmxn437wRYU63aP+pJsL2sQZk46z?= =?us-ascii?Q?QgmQytlPXZ3zYl4bJRiFrzSASz/vaCZIllfIzExAoSmZBMXYgqIuXTN1VBcl?= =?us-ascii?Q?M+eq46BrTRqO2s1je0u9klmIQ2dMogXEiI+bZwz3Nt6wyYjOLGqDBHA30Xl0?= =?us-ascii?Q?IEdZIVGyH2FG6fOGqvKqlcSa4o+3C8OBuYSbqyprMRjNEby+W11ionsBVL1s?= =?us-ascii?Q?Ehu/YJJHsUOR8AZMbsQ4qcqloug24rKFRz3gO/PyDl37OEHbtMqdQluYBB3Q?= =?us-ascii?Q?+ypo9mA5SJeK8RXQefTzFZVtpl3avsmtvFf42VKnU+7RR4E9beS+nATsdl7w?= =?us-ascii?Q?YRouzsfdjY+XNyWv6xZN?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d0f6b765-1f68-40a7-6634-08dbad3a741d X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2023 11:31:17.3461 (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: AM8P250MB0017 Subject: [FFmpeg-devel] [PATCH 18/20] avformat/matroskdec: Reindent after the previous commit 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 52 +++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 7adb72aa23..d6545fd30d 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2748,32 +2748,32 @@ static int mka_parse_audio(MatroskaTrack *track, AVStream *st, if (ret) return ret; - par->codec_type = AVMEDIA_TYPE_AUDIO; - par->sample_rate = track->audio.out_samplerate; - // channel layout may be already set by codec private checks above - if (!av_channel_layout_check(&par->ch_layout)) { - par->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; - par->ch_layout.nb_channels = track->audio.channels; - } - if (!par->bits_per_coded_sample) - par->bits_per_coded_sample = track->audio.bitdepth; - if (par->codec_id == AV_CODEC_ID_MP3 || - par->codec_id == AV_CODEC_ID_MLP || - par->codec_id == AV_CODEC_ID_TRUEHD) - sti->need_parsing = AVSTREAM_PARSE_FULL; - else if (par->codec_id != AV_CODEC_ID_AAC) - sti->need_parsing = AVSTREAM_PARSE_HEADERS; - if (track->codec_delay > 0) { - par->initial_padding = av_rescale_q(track->codec_delay, - (AVRational){1, 1000000000}, - (AVRational){1, par->codec_id == AV_CODEC_ID_OPUS ? - 48000 : par->sample_rate}); - } - if (track->seek_preroll > 0) { - par->seek_preroll = av_rescale_q(track->seek_preroll, - (AVRational){1, 1000000000}, - (AVRational){1, par->sample_rate}); - } + par->codec_type = AVMEDIA_TYPE_AUDIO; + par->sample_rate = track->audio.out_samplerate; + // channel layout may be already set by codec private checks above + if (!av_channel_layout_check(&par->ch_layout)) { + par->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + par->ch_layout.nb_channels = track->audio.channels; + } + if (!par->bits_per_coded_sample) + par->bits_per_coded_sample = track->audio.bitdepth; + if (par->codec_id == AV_CODEC_ID_MP3 || + par->codec_id == AV_CODEC_ID_MLP || + par->codec_id == AV_CODEC_ID_TRUEHD) + sti->need_parsing = AVSTREAM_PARSE_FULL; + else if (par->codec_id != AV_CODEC_ID_AAC) + sti->need_parsing = AVSTREAM_PARSE_HEADERS; + if (track->codec_delay > 0) { + par->initial_padding = av_rescale_q(track->codec_delay, + (AVRational){1, 1000000000}, + (AVRational){1, par->codec_id == AV_CODEC_ID_OPUS ? + 48000 : par->sample_rate}); + } + if (track->seek_preroll > 0) { + par->seek_preroll = av_rescale_q(track->seek_preroll, + (AVRational){1, 1000000000}, + (AVRational){1, par->sample_rate}); + } return 0; } -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".