diff options
author | Niklas Haas <git@haasn.dev> | 2024-04-05 20:32:00 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2024-04-09 14:36:56 +0200 |
commit | aa576857bed713e3c11470ad0bdfbb823e42fe96 (patch) | |
tree | c7a68c4be527ab7bcf7e8f679aa6818dab201a16 | |
parent | 5faa8ae7bf889997e90c4ddfed002f7b89c31162 (diff) |
fftools: drop unused/hacky macros
Having macros initialize local variables seems strange to me, and there
are no more current users of these macros. (The one that was commented
out was incorrect anyway, since the macro has changed in the meantime)
-rw-r--r-- | fftools/cmdutils.h | 13 | ||||
-rw-r--r-- | fftools/ffmpeg_filter.c | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h index 5966501d84..e8f77bd507 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -467,19 +467,6 @@ void *allocate_array_elem(void *array, size_t elem_size, int *nb_elems); #define GROW_ARRAY(array, nb_elems)\ grow_array((void**)&array, sizeof(*array), &nb_elems, nb_elems + 1) -#define GET_PIX_FMT_NAME(pix_fmt)\ - const char *name = av_get_pix_fmt_name(pix_fmt); - -#define GET_CODEC_NAME(id)\ - const char *name = avcodec_descriptor_get(id)->name; - -#define GET_SAMPLE_FMT_NAME(sample_fmt)\ - const char *name = av_get_sample_fmt_name(sample_fmt) - -#define GET_SAMPLE_RATE_NAME(rate)\ - char name[16];\ - snprintf(name, sizeof(name), "%d", rate); - double get_rotation(const int32_t *displaymatrix); /* read file contents into a string */ diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index f108f8daf9..111b165af5 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -416,7 +416,7 @@ static void choose_ ## name (OutputFilterPriv *ofp, AVBPrint *bprint) \ } //DEF_CHOOSE_FORMAT(pix_fmts, enum AVPixelFormat, format, formats, AV_PIX_FMT_NONE, -// GET_PIX_FMT_NAME) +// av_get_pix_fmt_name) DEF_CHOOSE_FORMAT(sample_fmts, enum AVSampleFormat, format, formats, AV_SAMPLE_FMT_NONE, "%s", av_get_sample_fmt_name) |