virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-08 16:54:03 +02:00
Code Issues Releases Activity

avutil/opt: Fix printing integer option defaults

Browse Source 
Integer values should not be printed using format specifier '%g' which leads to inexact display in case of higher values.

Before this patch:
  -trans_color       <int>        .D.V..... color value [...] (default 1.67772e+07)

Afterwards:
  -trans_color       <int>        .D.V..... color value [...] (default 16777215)

Signed-off-by: softworkz <softworkz@hotmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Soft Works 2019-09-17 01:36:33 +00:00 committed by Michael Niedermayer
parent 2f289ec914
commit 667df60b14
1 changed files with 18 additions and 1 deletions

19
libavutil/opt.c

@ -1034,6 +1034,23 @@ int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name)
return res & flag->default_val.i64; return res & flag->default_val.i64;
} }
static void log_int_value(void *av_log_obj, int level, int64_t i)
{
if (i == INT_MAX) {
av_log(av_log_obj, level, "INT_MAX");
} else if (i == INT_MIN) {
av_log(av_log_obj, level, "INT_MIN");
} else if (i == UINT32_MAX) {
av_log(av_log_obj, level, "UINT32_MAX");
} else if (i == INT64_MAX) {
av_log(av_log_obj, level, "I64_MAX");
} else if (i == INT64_MIN) {
av_log(av_log_obj, level, "I64_MIN");
} else {
av_log(av_log_obj, level, "%"PRId64, i);
}
}
static void log_value(void *av_log_obj, int level, double d) static void log_value(void *av_log_obj, int level, double d)
{ {
if (d == INT_MAX) { if (d == INT_MAX) {
@ -1254,7 +1271,7 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit,
if (def_const) if (def_const)
av_log(av_log_obj, AV_LOG_INFO, "%s", def_const); av_log(av_log_obj, AV_LOG_INFO, "%s", def_const);
else else
log_value(av_log_obj, AV_LOG_INFO, opt->default_val.i64); log_int_value(av_log_obj, AV_LOG_INFO, opt->default_val.i64);
break; break;
} }
case AV_OPT_TYPE_DOUBLE: case AV_OPT_TYPE_DOUBLE: