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 2C575424C4 for ; Thu, 17 Mar 2022 15:34:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9707968ADCC; Thu, 17 Mar 2022 17:34:32 +0200 (EET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074059.outbound.protection.outlook.com [40.92.74.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7627868A3B7 for ; Thu, 17 Mar 2022 17:34:26 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QtpwqYn4U3ghlgUV3sdXvYTXYAW5hi72rCI62TJ/C5mpitgdOn4O91RWyfxmzRT2TqLmvelxqQo/VqvC3nBJ7cmJO5igRMeyHX5R7JROuwqcCQ9wfGLAvvXAMHv/tqfr3DLqJ69E7pA1wJo+nG7Pc8yY9+N5jSVFNhZeL8/gQ7qfA6TeeIVqSAF39qKjyHcRuGQtxMhQ8lmftuOxJ97HUfic0aBrLPZu6HPLjHTdEhbbmqM0lX3eO48F9uKYMLanMKuO8rNPQGXdzg1JmCepmwrDQNusk+LROWXYkwrUBrg5MaEOoTu2w9yzlE13UbqIJKivddwDsOYpQ5Vkv/Z35w== 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=0qz15nUN79lykwBMVMeZ5uxRqVPXfSPdFiOLLQmReRw=; b=J2mhFqEnt63g5r/Ci0opOuhcHoauiyr2WUtowIGLyzpiDXzRoPsqrKrIz6iEMqWJBdq2lQLr+0/vxLn+DIyrx5PKsqPN7sYPPx2fGRZAydESVAkBnPf+DAVeWZMrM0TDVUxLgp9MfWnEMMaqoM0R8WjBezZEsBoJwyfuwQNbK3WiJfEM4/5Ol/mScUzsKvzgEYpFGo3eOfuAXXZPJTlDqMrBpPRYDFPPBkW4DsG2Ren+7GsmrS+LZvDT6io1dXCpT3RzeD5KRBXhIanb+CxgcI+/qryTM0mTIwBKkP5O+KLCt9Y4cNdrXrrtbctLVlPq22Mku+rbNiRFMKaKWJvyTA== 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=0qz15nUN79lykwBMVMeZ5uxRqVPXfSPdFiOLLQmReRw=; b=TPyOnXRd7l5qdNgacbpElv0f1y/hK/AKrfL6W3/QiX2ie+oPFZkPGg5h9aOKw8PSukrZNpeT3I5dOlQaiGZVasbsFQFzFhMudsANzWhj8WoHJPZOTGwd+kFJb23pRjjT1WdXcuLs423XJzvBjABhl19ZIqw3pUL3BfI9sUrxYTOiWvifkfkJxAfpU5Gf4fB7Q3mvO0KCjU6HdG9gxnc+dgujZOO62deuW8P/Ya4I3N0J9lXnRAzlHYBlx4juXQPCmWsXDYZU8PJhImb2MPY1uxNvB6CJrC3o3Aq9WSy8tOdEpIxvzbieXo0Y/VznpbgRJ2dkw7o+VvV5FpMaZjkG4A== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by DB3PR0102MB3514.eurprd01.prod.exchangelabs.com (2603:10a6:8:f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.26; Thu, 17 Mar 2022 15:34:23 +0000 Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8%3]) with mapi id 15.20.5081.016; Thu, 17 Mar 2022 15:34:23 +0000 Message-ID: Date: Thu, 17 Mar 2022 16:34:22 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220315090532.27295-1-anton@khirnov.net> <20220315090532.27295-5-anton@khirnov.net> From: Andreas Rheinhardt In-Reply-To: <20220315090532.27295-5-anton@khirnov.net> X-TMN: [yh2ODx9LiKvsfgzeKdp4BHTxxJE51/1S] X-ClientProxiedBy: AM6PR05CA0005.eurprd05.prod.outlook.com (2603:10a6:20b:2e::18) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 573ac3cc-c3f6-4d04-518c-08da082b9cef X-MS-TrafficTypeDiagnostic: DB3PR0102MB3514:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GXYMKJABgqOpB41WK0i64l0ahdYUx1sY0pkz4Bqa5VuPs7rqs4B0l9K66pSi982jtRrzdN/RrZ26ayMV+4y8gCWZG6/R+yN99koeVt2Y6xKWxslng9xhIrLx+OoOjEtiivl7dVxyruKx2y8LS38StqZC5IMvW2pBRoTjVS1HK1wIXi3XBnp4OAYcqyOUVnp4t1NOAhvdo8pzb3qlFAIul+yUGvtVRYbEYF0ZXkdsAIaA9Gm6AhZwatG0qTJ4u5B9qeIBezHI6DhYc+33aI2isfKK3WuqJEO2HfH5PtSSga/Z0q6efNCXTepac0tzEqJr3j6h/8yL4uv1Cz7LfWfK9O+gpcI28ZN4MtPRhEbP18JiqWAUFF/r2NatnyyN+Ov4LnhQ9sO5MPxVlpSR/j4REbv9rjV8a6zAGnGNDrTTVeZWrGyX4Snqb5z5uQLCoQFKHa9y8EaWjqupRchy81Mvr50KygSwpcQHeF6+ytHbVLnMLRbkXO66fUmTJKrg6NmaRFr1XdRcNQCyR4U03Vc2vDnio8Y23Ppj5Bb7NYWjgvkLcM6iCpyxjwHwaD4DACbC4EsFox5Y9J2LP0qqLiaihQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dlV1ZEZpYUVWb1QwUkgxb0FDanQxRUFWa0sxZlJseHh1VWIzK2dwZzlhK3E5?= =?utf-8?B?K0wrMUNTWWROU1lZQWRhYnczbFdNdXAxZVA1Yk1Dc3A3dkRpWEVyTVJ0ZnNj?= =?utf-8?B?WWVmdUJua3N3WkdhQk1YSEFtbGRPeDRtTkxpN3YrZ2paeWtwUzNoSUdPUk9O?= =?utf-8?B?WHR6QzQrZW9HcURUQTRvWEdnQ1E0MmJGQjluL2YrVFlhbFNka1VOMno0K05Q?= =?utf-8?B?emY2V3dER1owbkU5OXJTOUhsVDRScWdLUlY5RU9ac3JlY1NGamtYc0ZCMFlF?= =?utf-8?B?aW40UVNzMitvT0poM3dzU2NqVURmSjBGcFkwWlJxd21lU1NudVRPWi9IWHkr?= =?utf-8?B?ODNYZ1NKQy8zQmNNWEY4c2tmYzJhbmxzVGhTck1CLzZKSWRIVUFHai9paHdk?= =?utf-8?B?K1ZkUUdpUHNyMG01R2N3bCtEUDMwSUordFZmcFRTRW9zc3YxSjkrN245SUth?= =?utf-8?B?SU5leEJ0WXhOU0dpLytGY2g0eDRtc1VYUUJIWXY0N0VVbUs3NlFBTTY4Mm9a?= =?utf-8?B?WWw3MnhjR1lPNnovMDVSNUpqN0I4cUFWMUV3TFJFQ3NvaXBKdHhHdnZ5TzdS?= =?utf-8?B?N3lUa1VHd2lMR09Xb1lBVlJETjkyWG03bEFHMjNZMms0clR2WXNnQUZpS1Yz?= =?utf-8?B?SzNmMmdWM3hqNUJNTTVZcUw4Nm4wTWpITWhNYml3ZXNGVFFxbU1FTFMrMDdr?= =?utf-8?B?NEZ3TDI4TWNrZGVBRlBqYWNaLzl0RDZ3djV5NXhTZlVrRWg1ZUdzVjNxYTk1?= =?utf-8?B?L1Vab1k1V2JxUXYxUDhzWTBZN0lLR1JPbnkrRjVOQzg5TWlieXd6ajdqUzhB?= =?utf-8?B?TlJJVkhnclBHemk4eXVMLzA1RldNZnFFdTg0eDdSSFVaTm53aUE0WEFZbUFw?= =?utf-8?B?WXlDT2QwZFF0dVVybGM3d0ZobTdsSnNJcmtGVHVnd0ZsWGcrOTduQUxDZ25G?= =?utf-8?B?VzUzaDROb3phWFVQVTNvSlhxRFEycjEzUEN3MTlsbEZTKy9kblRGSzAxaUtN?= =?utf-8?B?Tk5icHdFUmVzWlBhS1JmQ28xb3ZmN2NPMU1tZk5LaU9mUGF2RkNIUjNJVDFT?= =?utf-8?B?QklOdHE4RDRpN2VzYWZMaXo2b0VEUXRxbHpZUi9Nb3hya3dod3ZJVUdnYzhV?= =?utf-8?B?ck9rN254Z3RLbjdEamV0L1pueEtvYzZKdDhoeFRLVXlTUW1hVDZaMjRrZ1Ux?= =?utf-8?B?eUZUZUlyaEtXL0dXdnNwR2F3WXAzazJEL2tXOGkrNXVFelpNZVNtOUlkZFUy?= =?utf-8?B?ZkJLRi9FZXVwV3ZqZGtyQ3lXUHVtNGtyUHRFOVg5NVMydDBzZ05LYlZ1SXhS?= =?utf-8?B?bmlSOERjQVAyREI4TVFmSTR3bHl6YmFwbm4zOFFYWnBkQ00vRFU0RkJCYnNX?= =?utf-8?B?akFOb081UXBSV3VCaTdSK2ZHRnN1K1pjeXppMlFmVUg1UTVYSzF0M2pydXVl?= =?utf-8?B?WlprWGpOTUl6QW16WGpnZHRjbVFiejVOSHgyMTZ3QXhkT0FKcjBoc080WU9X?= =?utf-8?B?NzBMTVByZThMaFN6OHZwL3I5aEhMa3ZLelUrRlpjRDYwYmNaellMLzZnNUdV?= =?utf-8?Q?rDrODGKdr746NVPxmGBh0d8xH1vevVmnWCETeOrx3hsAzw?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 573ac3cc-c3f6-4d04-518c-08da082b9cef X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2022 15:34:23.7610 (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: DB3PR0102MB3514 Subject: Re: [FFmpeg-devel] [PATCH 05/10] fftools: move opt_timelimit from cmdutils to ffmpeg 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: Anton Khirnov: > This option is only supported by ffmpeg. > --- > fftools/cmdutils.c | 17 ----------------- > fftools/ffmpeg_opt.c | 20 ++++++++++++++++++++ > 2 files changed, 20 insertions(+), 17 deletions(-) > > diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c > index 12ef07b62f..e5684fa840 100644 > --- a/fftools/cmdutils.c > +++ b/fftools/cmdutils.c > @@ -47,10 +47,6 @@ > #include "libavutil/opt.h" > #include "cmdutils.h" > #include "opt_common.h" > -#if HAVE_SYS_RESOURCE_H > -#include > -#include > -#endif > #ifdef _WIN32 > #include > #endif > @@ -797,19 +793,6 @@ do { \ > return 0; > } > > -int opt_timelimit(void *optctx, const char *opt, const char *arg) > -{ > -#if HAVE_SETRLIMIT > - int lim = parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX); > - struct rlimit rl = { lim, lim + 1 }; > - if (setrlimit(RLIMIT_CPU, &rl)) > - perror("setrlimit"); > -#else > - av_log(NULL, AV_LOG_WARNING, "-%s not implemented on this OS\n", opt); > -#endif > - return 0; > -} > - > void print_error(const char *filename, int err) > { > char errbuf[128]; > diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c > index b2746259d7..778e02c39e 100644 > --- a/fftools/ffmpeg_opt.c > +++ b/fftools/ffmpeg_opt.c > @@ -19,8 +19,15 @@ > * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > */ > > +#include "config.h" > + > #include > > +#if HAVE_SYS_RESOURCE_H > +#include > +#include > +#endif > + > #include "ffmpeg.h" > #include "cmdutils.h" > #include "opt_common.h" > @@ -3501,6 +3508,19 @@ static int opt_progress(void *optctx, const char *opt, const char *arg) > return 0; > } > > +int opt_timelimit(void *optctx, const char *opt, const char *arg) > +{ > +#if HAVE_SETRLIMIT > + int lim = parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX); > + struct rlimit rl = { lim, lim + 1 }; > + if (setrlimit(RLIMIT_CPU, &rl)) > + perror("setrlimit"); > +#else > + av_log(NULL, AV_LOG_WARNING, "-%s not implemented on this OS\n", opt); > +#endif > + return 0; > +} > + > #define OFFSET(x) offsetof(OptionsContext, x) > const OptionDef options[] = { > /* main options */ LGTM to moving. Didn't look at whether the headers removed from cmdutils.c were only used by opt_timelimit() though. - 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".