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 9D15A490F7 for ; Sat, 3 Feb 2024 19:18:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A51CA68CE31; Sat, 3 Feb 2024 21:18:38 +0200 (EET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2017.outbound.protection.outlook.com [40.92.75.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A47568BED3 for ; Sat, 3 Feb 2024 21:18:32 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lslKuOl7xutprtl5dqTc3z8rFkLqoIQ+nkjahrjVoqOiNL5Ia2nlDxB55AX4oyHKcr2tAdgI9lpZIBg8yxLfABsxVcKlO0OqwWAfOtb/uvRS5Bj5eZ1tJDk/zrBNevXS9PabpMgNIWlM6q0DByOI4w6nOFX8ntM+NjrvfVpqLrD220us5fLrm0yoOnnllC4HrcBL6Nn/liDqWaQrhb2uyLX8+Iyx2gp4TyS6zgHS0B5O50BRjTWsMgMGSjZsPWpyJE/KQbbjKklFqT8/VygRxhKMtmQwIrasu5YrMC1m2lLnnrjGVBWzQ2rGop+xA+CX+D5d2W2v+m8OPwSRXaOihQ== 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=jQm0gw0rKz4NREUHz2E5oZkfOo7qaaJa4g2+gyNgX1I=; b=TaB3Lfic+yQhL/GcI4MWkMJ1s+TyMo7s0NlY6pPxovCSQrb44pIqFnWNX9pZfgjzWvApPnfv22w18lSfKz9CXZMJAjHAMl4+dSay7BQf9G2+O6cfeB8Ab1vmsSgtD2dCUku/r15Y8DdxcpXiGthC8ReeSAxYQX21K3ka3qBDjtBiwb3hiL13pD/oL3RwvRU5p6m1M6qHu77tB0zCsbvQmmHJtH4hpKDUa2CHZIg+yXE2h8LfG7BwE9ifvn7IRRbY55hIszjqsSvwUUx891Du22v/oX/WYdhjL/QP60NpfLV2BcVsgdNCeP9t/jMVcxmxR4QLZOeQAoUKNnzkjRrkfA== 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=jQm0gw0rKz4NREUHz2E5oZkfOo7qaaJa4g2+gyNgX1I=; b=gx7FLgLGJU2pyDGzT6BNBDVtty86+w+219sjf1gIhkN/QUSHt7m15/kwMszjrC3Yh4x7ibSnMuUV7UyqWYSReNME7YAJQOkM2Xvj3ndsduU4VzZbI4WtbgKLCr5JgNzsywPTYM8J56WMZ5QhwarFteAvDC3D+YFACxFFQXIUQb+o5mOvVR0DQgFDDN8IMStPpY60HMEPHRAHrnf9A9BuqvD20k0DJEmt69Rf/yHoWKnKuBrZ+vl/KPZ2wizuKGxyxzytc69qvdGnEL3uDgELtZni02ei8Cu9AMw98KFUn6j3Sisko4YSN2VPJoeboM0AMj9psX5HP8ZhmKI2znwWIA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0366.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.31; Sat, 3 Feb 2024 19:18:28 +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.7202.031; Sat, 3 Feb 2024 19:18:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Feb 2024 20:20:14 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [lE7mjZT6cVSi9UBDxfrhJzhGfCErt/ZMxF41YIOyk+k=] X-ClientProxiedBy: ZR0P278CA0113.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::10) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240203192014.2109516-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0366:EE_ X-MS-Office365-Filtering-Correlation-Id: f0766ede-9ebe-438f-52fc-08dc24ece698 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9+FDoRusFHQmMkfC3nIH8yb2sAEQloaulBWz3VBVwpAP0so/ZscsABqOUtPIHnQ2aW/9j7+bMFtIegdcm3wmFSP0C3Y/QiGYiy70E69GdlG/c8FH++ikaezd3m2rhMaPapNxR2Kp/gnrH/XV3yDPI8A18aKmI7Z2arGpDknA9S+BclbSOstw+BzV+TdQcl2Z3WKEhzSeyGa1Ie6iNH9tmF+xEbQH7ZFa57/2Cf+4VDBQUlUBH035+xVrHb8ndmhHPT/HAd+h1jc834r0ubVt2S9gMIfwTHauQwaQexIKyYvYN1V3t4gO5+Zw1yIQTH3TIT5KHiFzkmz1rWfS1oCYpREUa5E4dtO4r2XUzoYBi3pLEugp+x2CWoJQXhXDjxDuWqt/HoGeCQ9gAMLU4+/gwDTulB1zCCNboeatmcGHEDJJ1G1fqk0agrgDNRgXHV9jIsnpQ2tSP3rgDm/7atVGtMoDvmfvFd5XMNf1kuTjdl7SkEQ2QFlWBs6VK7Mb6gs+Eg9TO5J7/iI+G9DMruMM2fvLWCicRBf7gXYtmEN5GaM7nmHJBnSX+P2cTzTm8CxtsqPOCjlMtuT3qMKEYuXqT/UezyhuiALR4BnOTbUqeM/OrtSljp/Tpbh2F/YrNdsA X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JB2XFhD0OJ5BmvPAOHbdpLAIuAcpxR1WPTzHF/Yk6/m+1x3Le32E3Km8d4Zx?= =?us-ascii?Q?m+BOIO0QL8MycUPIgksxYD05wP54BhJCuViH4XDWNU4e5mzHWa9z71Oy0DAH?= =?us-ascii?Q?GuOrAYFppTdKIk0lJP4iPMDMP73bEsCDggKCvxLcbl3lUzQqG7dY2KCQnUJn?= =?us-ascii?Q?0F88vyqD4lF1cqKJrdDUhXxG7R+siky/LE0fpVDKHHfxQh+0MH2gIqYGTWE/?= =?us-ascii?Q?xCkfyzh0fywH4H8JYEkykMi0HeENKZCgh7ZJOLs8fZFxgRxt8bkpm89MZQ0+?= =?us-ascii?Q?N3jD86KGTubuVlQwssDnB+BAdGqTKP2mx7oR225v7004wjD7lnAGr9FKCIA/?= =?us-ascii?Q?53HEYmfZXiMrG3uynMBJTiPUy+ez4dEQ84APpQCg8LK+rY8rh8ZvfqzNsvq/?= =?us-ascii?Q?mza9YYztEO2TAqiOSkdvp9dpVUXv15EmdAV4Vq1cKmZKouxl7HJOP9brx6SK?= =?us-ascii?Q?MRsufsNvD8B42MSdVGWl22WVeImzsfNBry+Mm8Z3rfpNXKfP7r+PsvMS9qA6?= =?us-ascii?Q?np74xtZPdrG4CkeK0v0cVq74yDpO1f/tAxzVXe6tJoWUw5+NwkHr8pZ3DpzH?= =?us-ascii?Q?XLVOKdu4KYkYj4CJBWvGJDpSDsPfpKzk6fSYNNCtLXfPbP86Q30nceUXlcRA?= =?us-ascii?Q?sQ4BjZ64ntgOjTOkhbGpVRQDoe+vj7EoG2i3DVMT42LAtiWxtKJfYYJni2vA?= =?us-ascii?Q?9bhf7TmpWMrgs/UuWdzmH0rEvufODojHf/O3I6kz5SwlpN+TXp+9hjDwze7y?= =?us-ascii?Q?YOPw6sYobgYrP9wugtpLHy3G860Rg1Jk2GVvsXjWv4gssomphQOGExhIeBf1?= =?us-ascii?Q?4TMOLC7i67WJRcp1mH1N/FyP6/tNzJ+jgzrifh/54eL2lCPjyQ9iB4YKcq4C?= =?us-ascii?Q?I5/Hd/yvF3c9PJqjQcE9QC6Qbso9/SJl5/cllFY087/0CMLckipoEkmMS54o?= =?us-ascii?Q?Qz9ehsFIR2UJLje0wO7jlc11XAFgJCk96xtZaAXojL9OYU6z0glq5kvIaWvN?= =?us-ascii?Q?vtcYf4hLGxuxiwTyPBmkyb21BBER0m5OQxsBWRb114veTgeBdellP8O0mZ0C?= =?us-ascii?Q?rg76JUrcjT2bl+7kGGitSZH+960T0yE+jHMZWqZrn/DFVIDpCVpt8tkpuoEo?= =?us-ascii?Q?VLJudnFxQGKsYgNlhWU0ujAuO6Unh/Zxy0XvhjjWi4Og8LI1SJ4YeJycjgK4?= =?us-ascii?Q?uA9r5q1ruKbXjAqfQEJIMp8bfrmE4f6OCS2Tr8U5V77uipm+FhcThOgJeUAX?= =?us-ascii?Q?exY2L0ud++E1t1nh8sWb?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0766ede-9ebe-438f-52fc-08dc24ece698 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2024 19:18:28.1511 (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: DU2P250MB0366 Subject: [FFmpeg-devel] [PATCH] avformat/nutenc: Fix indentation 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: Forgotten after 82beb46e65e5f820b187355bf757725c22a59c45. Also use loop-scope for iterators while at it. Signed-off-by: Andreas Rheinhardt --- libavformat/nutenc.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index a5198c7ca9..5e0e36babe 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -1063,21 +1063,21 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt) ffio_free_dyn_buf(&dyn_bc); if (nut->write_index) { - if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts)) < 0) - goto fail; - - if ((1ll<<60) % nut->sp_count == 0) - for (i=0; inb_streams; i++) { - int j; - StreamContext *nus = &nut->stream[i]; - av_reallocp_array(&nus->keyframe_pts, 2*nut->sp_count, sizeof(*nus->keyframe_pts)); - if (!nus->keyframe_pts) { - ret = AVERROR(ENOMEM); - goto fail; - } - for (j=nut->sp_count == 1 ? 0 : nut->sp_count; j<2*nut->sp_count; j++) - nus->keyframe_pts[j] = AV_NOPTS_VALUE; - } + if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts)) < 0) + goto fail; + + if ((1ll<<60) % nut->sp_count == 0) + for (unsigned i = 0; i < s->nb_streams; i++) { + StreamContext *nus = &nut->stream[i]; + av_reallocp_array(&nus->keyframe_pts, 2*nut->sp_count, sizeof(*nus->keyframe_pts)); + if (!nus->keyframe_pts) { + ret = AVERROR(ENOMEM); + goto fail; + } + for (int j = nut->sp_count == 1 ? 0 : nut->sp_count; + j < 2 * nut->sp_count; j++) + nus->keyframe_pts[j] = AV_NOPTS_VALUE; + } } } av_assert0(nus->last_pts != AV_NOPTS_VALUE); -- 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".