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 B50CE48BAB for ; Tue, 6 Feb 2024 08:59:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 057A768D14A; Tue, 6 Feb 2024 10:59:03 +0200 (EET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2108.outbound.protection.outlook.com [40.92.74.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 303BA68C8CA for ; Tue, 6 Feb 2024 10:58:56 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M73rC5i7q+B4vxIUZMKgc/pGPV2G3XDk0l7kX6jBd6Qh+kxpOhlE7pt3x5pOQF71l5UTgTVeKZQ5ssyTNzC5pBj8i8O8H/IUyG55w1F5v1voqw7jLpsN/YZ+PUhTRIw04LMNqTbTq7DxdZA9TnwRE2/+OoEIhOa3cpozgevQ+z6VojxVVv+Du9ZwTJRfgVWjpQFeuvjwbDZPkz2wF4iEnDAwY2uvAzHZxqxaXIvvKMhTUcXXQvCff7oINK8tZnXFUNhpcMygw20G0SaOsY91tVpB3SRSA5zWjP7NvUWMEho+E6e34wWsW6b7/8hiMq81zhqbNHZMWzk0qLyPIWJ4ow== 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=9Jbt98b2vwLaovprdQ8rJ47dIZaLN88hqT+0WDiKKa4=; b=Ko+k7hmz4BeqjiU6UhVB2cbPqdlXowSMdtRGsBB9v1X6Rz0NjG90zV1npt8CXko+5m+AHtfUsEjWKYeSXS9v13B8hPkjrhjqroz6aic/3idzEdRHpRSIm5kmIHmrw674flzKRedinh6hPFdZtYirpbojhk0SSfomxP5ZuM+WKVRm4x9zmVVc5lQwwyeEN7fxaGTWQEU3475HxueMf46KQWhUh4AE+PME0Ew7QYVQ8lE7nddafiBsfRC4DWRclQDlPAXyhwXK1AThCyMeT8XNvXqc1WpUdka/yzVWBz41eiP1yQQauqhq1+OTcFOW3+5Rs0Fi+X4kQfhDrilgLrUthQ== 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=9Jbt98b2vwLaovprdQ8rJ47dIZaLN88hqT+0WDiKKa4=; b=n/cNTodCBLq0wIqG3Wom4JmKFikxrHnP6ixBkn8mTa3Tb8L+/xcfyhMiJlOLhsoGGPv2xfTSxNreIfO7jfjiFl9hWCrav6o1w0ssAivYPf9Z1IdLey/ZhTShcNdnHvoVabjqmk4kfAavsfBux3FB5fLt3wfozpeTZX/I5LC7oLvmgCNKAjokYSI7Izs2RNXnaWCDYsuZmhnVk60GHQTun/6hQSpDFUteMBRzh7+pQejfFS6saZyB2iJwv7dhtOun/0uilu8BYJfv8Qn7mnR+yOxttZwkZCBMk7j6Z6xYejC3pAZpzKf0/TVVtW/cjpo2OgOmU8IF8sYwbS1FvZp0mA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0239.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:278::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.36; Tue, 6 Feb 2024 08:58:54 +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.7249.032; Tue, 6 Feb 2024 08:58:54 +0000 Message-ID: Date: Tue, 6 Feb 2024 10:00:49 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [FHDmVmW0zKv5J3Z5+T15NsiBqpJB2nAPAoxuDx6tKo4=] X-ClientProxiedBy: ZR0P278CA0171.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::9) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0239:EE_ X-MS-Office365-Filtering-Correlation-Id: 62610cf2-1178-4048-5d3c-08dc26f1d88c X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqmcPDF1KAd/mmqN5uWR7ypEZ+Kdj92olNwfWLN0WITfj56jWL2KQarvtEDLAKq1MTNoWdxg9zJtzcnpTWgE+akctsSIJGLHrqnN0PxBTQihUAPf1Qt6LdUYCxuqmC3vbTU7w14KWkWooeOr0BjL3GQmOzFAf8DcBE8CTukoqx7I0q5XPK/s/KZmuk/4tQ2m2UDdMAPVtKAyXAISKtnVONHmyW4DoCcmkjAXl5lJ9MJx8iG6Gxr+mDekQtjF7n7CaFHTKNUFJWlCGuOU/xM1PO5bF3eC1PobqPITUjhG0J9vWfHj6B8887BBEOF/w3q5DO4SKZ+acirSSa8s8sVDUxvs4QhdXfkcfYRQS5m+diceteEvHGPgoi6tLPsXKWPr8AGYh17jTXb6FPVDekzt+X+wCvJzuOWp7N909OECGIUQExBTTyRKiz4/iXwYoe4pNVfpLoeteZFGoWXa+GcONdV817HWPlcJMT+3AN38t051OXPPRJy6iqRxMYLnRniDhwrYKf/JndqKeDxNrnXt4IW9EJEl6Zr+tMp9YIPbD7frw28JphkfVD/wvrWrpkmqxuwUz6DnfQmOhzazmu03wJqeonX/2X4V+I+3jHvewnkkfuec+RksBEzX0XwTMqqT/qt6KgUVlyEp3t/+4s6rCPR44JZTmGea8FyNPdeYHlgFkT39pXKHaQTlk2dWXvPQ8r/lkEYpvdB3CbxTfcJrvzm6LUFCKS0RB22crmvAZ/1gBH2m1hkC9pIXTucpk1Yrtc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FzxZx8rL4gQgSKS5XYfIqkSd2S8AWiBjsbPvrFonHtjayi+EzOyhOn+kgwPEzcRPHPlg9qqiA50j9xn24HCYdK02c83u+Mr0jAKmVOGooiRr9gQ5T17AHY/7QYLlxYWvrOcDo7Xz3QqnNElvRkQu9pBofDpqCiTT9voAKwJMtFegcPWl3T/qdSQqa47w43SyKu2raELMdDkUZtLs9bVnqsirtFqz9LkLJggXTzgucyrvmGe6FNCQ31PHzst93+eJ7BtPuHdQcRZDe2v7Tm88jZvia68RRkvBwVa8fDLvBvIif3Ti3dctNZb239WxjIPYxC90pj5n2an2JroiqIGOHO0SKGRnjAKxcyU7wGs99Neol2kd26ernU9DOuIlp29UEQ7troFOAG+rNL3mnEec0GYczC+73EmNVDFGXuGn+gn24hVeZEu/0Zcq2HTXNSymiBF1lvOt4rGYLiE/G77BS0KCVP7FcIAuJTsAKXHhhQWQt48wFcsdzGszqINvbk8jg45Nw4j3CdFwQWkR9I9OfKb2h8oqdcB45ToJOIqp63sHq/EbihPwRWgPvF5TKIJD X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YUVudkthdWRyTlZqeXRyU3J4cDV6YnBrTkJNMTJQUkE2UDRsaVM3WUcxN1hH?= =?utf-8?B?VFIzVGN3MDFORTExcWh6QlFFTzY1a3YvSTUvNFJzdm96bUNuUm9kMUpmZ20v?= =?utf-8?B?VGVzMUFtdUhXK1lobi9nUDdKd0hNR1g4S1BJbERVT2ViclpLSFp3N2dIRkY2?= =?utf-8?B?RllEbTNjOGxGZGdwa1NIYWJQMUcrRDgzY1J4Y3h3ZU83QlJsbThYejNEWEtF?= =?utf-8?B?RXpMemFzclJSeU96NGRZK3JEOEs0MnpmRzdMK242Z3N3MlZCc0hCL0ZCRStZ?= =?utf-8?B?d3l1KzBqYVlEdTR3S2RvZ1plcUM4RkZQRUlLaXJYdEtuVWJIbG1hRGxxeFAx?= =?utf-8?B?STgyQVMxblBYSW9ydS93SllqMG55Sm9BeEtjMHI4QS82SGFDQmpKU3JIdWp4?= =?utf-8?B?bzBYZmJ4bVZyTWhDR1VYa0pGRnpYeUR0NlJ1NUJUMkhRQ2Y3cFFHZ004elVO?= =?utf-8?B?d3V3Zkx0UER1clB0K2Vxd3plYnJPRkJrK05EZ3NUUDdoUjhyV3RKY3dkZ3FJ?= =?utf-8?B?TUpaR3VrcTU1bnRNZklTeFhteTBRUWZ5NWJsQ1ZxL0pjdDFWNjN2WW0zN1dE?= =?utf-8?B?OGViTXVCUW1QdTNNdUdQTVdCeVcxTStTVUM4VkJJOGxWUHBEOVpKem5yT2ND?= =?utf-8?B?MHdGKzgySGNNWkZoTlhYelA2Zjk4UGpZWklpT1l5Z2liTUNuRDJkQXVLcEIw?= =?utf-8?B?Q0RLMGJXTXZPb2I0WGNUT0xCNGVyM0hzVlhhclhUOW00bjVUcFZnVnFQaWg3?= =?utf-8?B?MnBTK0ltTy9iSlFVelQvQjdEcmg4N1R3SDZiVThVUmpWM2ZLTnU0SmUwbmll?= =?utf-8?B?bWdMeUJPMXJmZHR0ZmdVaVo3QTM1TFVhZ1E3NFpLVytLZ2oxTVdJSTFxNERy?= =?utf-8?B?Q3VuYzdFTFVwK1BVNmIza2NGc1o1RnRDUW1oR0M1R2dQR21CMmVRU1BkckRz?= =?utf-8?B?NmwwVGJzTmo4eHpxMTZRUi9LMzBTY0lSb2pta0xFc0FNNlAvb2VyclZiMHND?= =?utf-8?B?aHRBWnZvWE1OZTZYckM4ZThrRktxRFg5Vi9ka1UxU0hYQ3FoQ01QMG5lclN6?= =?utf-8?B?UDRZR0hmd1IyZ0poOGJUUDdkbi9mRFB2NzRtSGQ3WWxRSFZxYnRHM0puYnVr?= =?utf-8?B?VXl6eEZQS1lOa2lNRVRkVzRMblNNSll4Kzk3SWNreDNrMGpMZjh5T0pEN0Zq?= =?utf-8?B?dXliNjd2THhweXEyTFlYQ3dtUTBxdWVzakxxTXJUbjRDNi91VUY2ZFd2NVoy?= =?utf-8?B?dG1MUnIwRW53VnVZbDU4YS9oZ2pyb0d1bTlNRmI5cHBrR05KMi9SRS9iTXRQ?= =?utf-8?B?UjVrZFpidGVXMkJiMURSM2tYODV4TFJzOUF6ck1KUkVTUmVjRExIK3lsa2RI?= =?utf-8?B?WlNxczR3R0YyZGtHYlRRVkhWRFJQbG81T3A5THk5c3lBc3hwNkZEWkxhWVN4?= =?utf-8?B?NnErRkRIM01EU2NVSnJMRzA4U1c5TFNwK3k5YkduNE1pd3doVmNML1N1aFph?= =?utf-8?B?eVl1WEZTRkk1eEo5elVQNWZSS2ZidjhMOXVWcm5maHlnOXBXb2Z2Y3cxUDl5?= =?utf-8?B?dkFHSHp1Tk5TWnFwbDhQNnZSRnlVQjRjd2xaaC9JWDB6UjlNZ1daWWRWYVhl?= =?utf-8?B?RGFkblFBQkJuOThmQXdlOWJLaHZudkFYVG1wSXQ4S28wK1VHNGxIbi9IN1cw?= =?utf-8?Q?OILdisw6CvjxFU7E585J?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 62610cf2-1178-4048-5d3c-08dc26f1d88c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2024 08:58:54.3346 (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: DU2P250MB0239 Subject: Re: [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 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: Andreas Rheinhardt: > 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); Will apply tonight unless there are objections. - Andreas _______________________________________________ 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".