From b66ba6f7269bcb4d90740c948113c86cdd359db1 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Tue, 15 Apr 2025 00:57:42 +0200
Subject: [PATCH 07/12] fftools/textformat: Use av_default_item_name()
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
fftools/textformat/tf_compact.c | 6 +-----
fftools/textformat/tf_default.c | 6 +-----
fftools/textformat/tf_flat.c | 6 +-----
fftools/textformat/tf_ini.c | 6 +-----
fftools/textformat/tf_json.c | 6 +-----
fftools/textformat/tf_xml.c | 6 +-----
6 files changed, 6 insertions(+), 30 deletions(-)
diff --git a/fftools/textformat/tf_compact.c b/fftools/textformat/tf_compact.c
index 31bfc81513..c72f401afc 100644
--- a/fftools/textformat/tf_compact.c
+++ b/fftools/textformat/tf_compact.c
@@ -36,13 +36,9 @@
#define DEFINE_FORMATTER_CLASS(name) \
-static const char *name##_get_name(void *ctx) \
-{ \
- return #name ; \
-} \
static const AVClass name##_class = { \
.class_name = #name, \
- .item_name = name##_get_name, \
+ .item_name = av_default_item_name, \
.option = name##_options \
}
diff --git a/fftools/textformat/tf_default.c b/fftools/textformat/tf_default.c
index 86582829e4..17dc12168e 100644
--- a/fftools/textformat/tf_default.c
+++ b/fftools/textformat/tf_default.c
@@ -33,13 +33,9 @@
#define writer_printf(wctx_, fmt_, ...) (wctx_)->writer->writer->writer_printf((wctx_)->writer, fmt_, __VA_ARGS__)
#define DEFINE_FORMATTER_CLASS(name) \
-static const char *name##_get_name(void *ctx) \
-{ \
- return #name ; \
-} \
static const AVClass name##_class = { \
.class_name = #name, \
- .item_name = name##_get_name, \
+ .item_name = av_default_item_name, \
.option = name##_options \
}
diff --git a/fftools/textformat/tf_flat.c b/fftools/textformat/tf_flat.c
index 919d44bc6b..05aae262ab 100644
--- a/fftools/textformat/tf_flat.c
+++ b/fftools/textformat/tf_flat.c
@@ -34,13 +34,9 @@
#define writer_printf(wctx_, fmt_, ...) (wctx_)->writer->writer->writer_printf((wctx_)->writer, fmt_, __VA_ARGS__)
#define DEFINE_FORMATTER_CLASS(name) \
-static const char *name##_get_name(void *ctx) \
-{ \
- return #name ; \
-} \
static const AVClass name##_class = { \
.class_name = #name, \
- .item_name = name##_get_name, \
+ .item_name = av_default_item_name, \
.option = name##_options \
}
diff --git a/fftools/textformat/tf_ini.c b/fftools/textformat/tf_ini.c
index d8099ff92e..4c694bc78a 100644
--- a/fftools/textformat/tf_ini.c
+++ b/fftools/textformat/tf_ini.c
@@ -34,13 +34,9 @@
#define writer_printf(wctx_, fmt_, ...) (wctx_)->writer->writer->writer_printf((wctx_)->writer, fmt_, __VA_ARGS__)
#define DEFINE_FORMATTER_CLASS(name) \
-static const char *name##_get_name(void *ctx) \
-{ \
- return #name ; \
-} \
static const AVClass name##_class = { \
.class_name = #name, \
- .item_name = name##_get_name, \
+ .item_name = av_default_item_name, \
.option = name##_options \
}
diff --git a/fftools/textformat/tf_json.c b/fftools/textformat/tf_json.c
index c26a912435..0a4c9f8b25 100644
--- a/fftools/textformat/tf_json.c
+++ b/fftools/textformat/tf_json.c
@@ -33,13 +33,9 @@
#define writer_printf(wctx_, fmt_, ...) (wctx_)->writer->writer->writer_printf((wctx_)->writer, fmt_, __VA_ARGS__)
#define DEFINE_FORMATTER_CLASS(name) \
-static const char *name##_get_name(void *ctx) \
-{ \
- return #name ; \
-} \
static const AVClass name##_class = { \
.class_name = #name, \
- .item_name = name##_get_name, \
+ .item_name = av_default_item_name, \
.option = name##_options \
}
diff --git a/fftools/textformat/tf_xml.c b/fftools/textformat/tf_xml.c
index 6c89d01e9d..96751433ed 100644
--- a/fftools/textformat/tf_xml.c
+++ b/fftools/textformat/tf_xml.c
@@ -34,13 +34,9 @@
#define writer_printf(wctx_, fmt_, ...) (wctx_)->writer->writer->writer_printf((wctx_)->writer, fmt_, __VA_ARGS__)
#define DEFINE_FORMATTER_CLASS(name) \
-static const char *name##_get_name(void *ctx) \
-{ \
- return #name ; \
-} \
static const AVClass name##_class = { \
.class_name = #name, \
- .item_name = name##_get_name, \
+ .item_name = av_default_item_name, \
.option = name##_options \
}
--
2.45.2