diff options
| author | Anton Khirnov <anton@khirnov.net> | 2022-03-09 12:16:16 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2022-03-22 18:49:43 +0100 |
| commit | 00da464658c85f498b0078073856f1ff3f34a468 (patch) | |
| tree | 03b8cb1d15ba812dbdeb7755f756ca14c3b7e060 /fftools | |
| parent | a545cb2b9dc689ae19e75be27a3550d97cb9cf72 (diff) | |
| download | ffmpeg-00da464658c85f498b0078073856f1ff3f34a468.tar.gz | |
fftools: move opt_timelimit from cmdutils to ffmpeg
This option is only supported by ffmpeg.
Diffstat (limited to 'fftools')
| -rw-r--r-- | fftools/cmdutils.c | 17 | ||||
| -rw-r--r-- | fftools/ffmpeg_opt.c | 20 |
2 files changed, 20 insertions, 17 deletions
diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index e7d8ef6765..8d88f18fb3 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -48,10 +48,6 @@ #include "libavutil/opt.h" #include "cmdutils.h" #include "opt_common.h" -#if HAVE_SYS_RESOURCE_H -#include <sys/time.h> -#include <sys/resource.h> -#endif #ifdef _WIN32 #include <windows.h> #endif @@ -798,19 +794,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 ea98778cbd..b5980e8041 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 <stdint.h> +#if HAVE_SYS_RESOURCE_H +#include <sys/time.h> +#include <sys/resource.h> +#endif + #include "ffmpeg.h" #include "cmdutils.h" #include "opt_common.h" @@ -3500,6 +3507,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 */ |