fftools/textformat: renamings in print_unit_int for consistency (cosmetic)

Nicolas Gaullier committed 1 year ago

Commit 18c62241 parent 2b25a664 files · +5 −5Browse files

Unified · Split

4 files

fftools/ffprobe.c +1 −1
fftools/graph/graphprint.c +1 −1
fftools/textformat/avtextformat.c +2 −2
fftools/textformat/avtextformat.h +1 −1

fftools/ffprobe.c+1−1

@@ -429,7 +429,7 @@ static void log_callback(void ptr, int level, const char fmt, va_list vl) · 428 unmodified lines
429	#define print_ts(k, v) avtext_print_ts(tfc, k, v, 0)	429	#define print_ts(k, v) avtext_print_ts(tfc, k, v, 0)
430	#define print_duration_time(k, v, tb) avtext_print_time(tfc, k, v, tb, 1)	430	#define print_duration_time(k, v, tb) avtext_print_time(tfc, k, v, tb, 1)
431	#define print_duration_ts(k, v) avtext_print_ts(tfc, k, v, 1)	431	#define print_duration_ts(k, v) avtext_print_ts(tfc, k, v, 1)
432	#define print_val(k, v, u) avtext_print_unit_int(tfc, k, v, u)	432	#define print_val(k, v, u) avtext_print_unit_integer(tfc, k, v, u)
433		433
434	#define REALLOCZ_ARRAY_STREAM(ptr, cur_n, new_n) \	434	#define REALLOCZ_ARRAY_STREAM(ptr, cur_n, new_n) \
435	{ \	435	{ \

fftools/graph/graphprint.c+1−1

@@ -140,7 +140,7 @@ typedef struct GraphPrintContext { · 139 unmodified lines
140	#define print_q(k, v, s) avtext_print_rational(tfc, k, v, s)	140	#define print_q(k, v, s) avtext_print_rational(tfc, k, v, s)
141	#define print_str(k, v) avtext_print_string(tfc, k, v, 0)	141	#define print_str(k, v) avtext_print_string(tfc, k, v, 0)
142	#define print_str_opt(k, v) avtext_print_string(tfc, k, v, gpc->opt_flags)	142	#define print_str_opt(k, v) avtext_print_string(tfc, k, v, gpc->opt_flags)
143	#define print_val(k, v, u) avtext_print_unit_int(tfc, k, v, u)	143	#define print_val(k, v, u) avtext_print_unit_integer(tfc, k, v, u)
144		144
145	#define print_fmt(k, f, ...) do { \	145	#define print_fmt(k, f, ...) do { \
146	av_bprint_clear(&gpc->pbuf); \	146	av_bprint_clear(&gpc->pbuf); \

fftools/textformat/avtextformat.c+2−2

@@ -433,11 +433,11 @@ static char value_string(const AVTextFormatContext tctx, char *buf, int buf_si · 432 unmodified lines
433	}	433	}
434		434
435		435
436	void avtext_print_unit_int(AVTextFormatContext tctx, const char key, int64_t value, const char *unit)	436	void avtext_print_unit_integer(AVTextFormatContext tctx, const char key, int64_t val, const char *unit)
437	{	437	{
438	char val_str[128];	438	char val_str[128];
439	struct unit_value uv;	439	struct unit_value uv;
440	uv.val.i = value;	440	uv.val.i = val;
441	uv.unit = unit;	441	uv.unit = unit;
442	avtext_print_string(tctx, key, value_string(tctx, val_str, sizeof(val_str), uv), 0);	442	avtext_print_string(tctx, key, value_string(tctx, val_str, sizeof(val_str), uv), 0);
443	}	443	}

fftools/textformat/avtextformat.h+1−1

@@ -169,7 +169,7 @@ void avtext_print_integer(AVTextFormatContext tctx, const char key, int64_t va · 168 unmodified lines
169		169
170	int avtext_print_string(AVTextFormatContext tctx, const char key, const char *val, int flags);	170	int avtext_print_string(AVTextFormatContext tctx, const char key, const char *val, int flags);
171		171
172	void avtext_print_unit_int(AVTextFormatContext tctx, const char key, int64_t value, const char *unit);	172	void avtext_print_unit_integer(AVTextFormatContext tctx, const char key, int64_t val, const char *unit);
173		173
174	void avtext_print_rational(AVTextFormatContext tctx, const char key, AVRational q, char sep);	174	void avtext_print_rational(AVTextFormatContext tctx, const char key, AVRational q, char sep);
175		175