aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2023-07-14 13:49:49 +0200
committerAnton Khirnov <anton@khirnov.net>2023-07-20 20:40:26 +0200
commit4adbe2d219c13d5342d073aace5001a64c57d9c8 (patch)
tree91a26627aac72a0f43522db1a6d5d25b2baeb344
parenta50f90f1c23e9b10248add652f255618bb1063ee (diff)
downloadffmpeg-4adbe2d219c13d5342d073aace5001a64c57d9c8.tar.gz
fftools/opt_common: replace exit_program() with returning error codes
-rw-r--r--fftools/opt_common.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/fftools/opt_common.c b/fftools/opt_common.c
index f6fe9815e1..39258bb46c 100644
--- a/fftools/opt_common.c
+++ b/fftools/opt_common.c
@@ -1159,7 +1159,9 @@ int init_report(const char *env, FILE **file)
report_file_level = strtol(val, &tail, 10);
if (*tail) {
av_log(NULL, AV_LOG_FATAL, "Invalid report file level\n");
- exit_program(1);
+ av_free(key);
+ av_free(val);
+ return AVERROR(EINVAL);
}
envlevel = 1;
} else {
@@ -1219,7 +1221,7 @@ int opt_max_alloc(void *optctx, const char *opt, const char *arg)
max = strtol(arg, &tail, 10);
if (*tail) {
av_log(NULL, AV_LOG_FATAL, "Invalid max_alloc \"%s\".\n", arg);
- exit_program(1);
+ return AVERROR(EINVAL);
}
av_max_alloc(max);
return 0;
@@ -1293,7 +1295,7 @@ int opt_loglevel(void *optctx, const char *opt, const char *arg)
"Possible levels are numbers or:\n", arg);
for (i = 0; i < FF_ARRAY_ELEMS(log_levels); i++)
av_log(NULL, AV_LOG_FATAL, "\"%s\"\n", log_levels[i].name);
- exit_program(1);
+ return AVERROR(EINVAL);
}
end: