diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 1346ed33c5..e8cde01407 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -429,7 +429,7 @@ static void log_callback(void *ptr, int level, const char *fmt, va_list vl) #define print_ts(k, v) avtext_print_ts(tfc, k, v, 0) #define print_duration_time(k, v, tb) avtext_print_time(tfc, k, v, tb, 1) #define print_duration_ts(k, v) avtext_print_ts(tfc, k, v, 1) -#define print_val(k, v, u) avtext_print_unit_int(tfc, k, v, u) +#define print_val(k, v, u) avtext_print_unit_integer(tfc, k, v, u) #define REALLOCZ_ARRAY_STREAM(ptr, cur_n, new_n) \ { \ diff --git a/fftools/graph/graphprint.c b/fftools/graph/graphprint.c index e4c6886cf8..242eaf8ba1 100644 --- a/fftools/graph/graphprint.c +++ b/fftools/graph/graphprint.c @@ -140,7 +140,7 @@ typedef struct GraphPrintContext { #define print_q(k, v, s) avtext_print_rational(tfc, k, v, s) #define print_str(k, v) avtext_print_string(tfc, k, v, 0) #define print_str_opt(k, v) avtext_print_string(tfc, k, v, gpc->opt_flags) -#define print_val(k, v, u) avtext_print_unit_int(tfc, k, v, u) +#define print_val(k, v, u) avtext_print_unit_integer(tfc, k, v, u) #define print_fmt(k, f, ...) do { \ av_bprint_clear(&gpc->pbuf); \ diff --git a/fftools/textformat/avtextformat.c b/fftools/textformat/avtextformat.c index af47879767..651a84578c 100644 --- a/fftools/textformat/avtextformat.c +++ b/fftools/textformat/avtextformat.c @@ -433,11 +433,11 @@ static char *value_string(const AVTextFormatContext *tctx, char *buf, int buf_si } -void avtext_print_unit_int(AVTextFormatContext *tctx, const char *key, int64_t value, const char *unit) +void avtext_print_unit_integer(AVTextFormatContext *tctx, const char *key, int64_t val, const char *unit) { char val_str[128]; struct unit_value uv; - uv.val.i = value; + uv.val.i = val; uv.unit = unit; avtext_print_string(tctx, key, value_string(tctx, val_str, sizeof(val_str), uv), 0); } diff --git a/fftools/textformat/avtextformat.h b/fftools/textformat/avtextformat.h index 8316829af5..d9c14069eb 100644 --- a/fftools/textformat/avtextformat.h +++ b/fftools/textformat/avtextformat.h @@ -169,7 +169,7 @@ void avtext_print_integer(AVTextFormatContext *tctx, const char *key, int64_t va int avtext_print_string(AVTextFormatContext *tctx, const char *key, const char *val, int flags); -void avtext_print_unit_int(AVTextFormatContext *tctx, const char *key, int64_t value, const char *unit); +void avtext_print_unit_integer(AVTextFormatContext *tctx, const char *key, int64_t val, const char *unit); void avtext_print_rational(AVTextFormatContext *tctx, const char *key, AVRational q, char sep);