diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 36e45c53c1..5ba961f059 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -389,6 +389,7 @@ static void print_sample_rate(AVBPrint *bp, const void *ratesp) static const AVFilterFormatsMerger mergers_video[] = { { + .name = "Pixel formats", .offset = offsetof(AVFilterFormatsConfig, formats), .merge = merge_pix_fmts, .can_merge = can_merge_pix_fmts, @@ -396,6 +397,7 @@ static const AVFilterFormatsMerger mergers_video[] = { CONVERSION_FILTER_SWSCALE }, { + .name = "Color spaces", .offset = offsetof(AVFilterFormatsConfig, color_spaces), .merge = merge_generic, .can_merge = can_merge_generic, @@ -403,6 +405,7 @@ static const AVFilterFormatsMerger mergers_video[] = { CONVERSION_FILTER_SWSCALE }, { + .name = "Color ranges", .offset = offsetof(AVFilterFormatsConfig, color_ranges), .merge = merge_generic, .can_merge = can_merge_generic, @@ -410,6 +413,7 @@ static const AVFilterFormatsMerger mergers_video[] = { CONVERSION_FILTER_SWSCALE }, { + .name = "Alpha modes", .offset = offsetof(AVFilterFormatsConfig, alpha_modes), .merge = merge_generic, .can_merge = can_merge_generic, @@ -420,6 +424,7 @@ static const AVFilterFormatsMerger mergers_video[] = { static const AVFilterFormatsMerger mergers_audio[] = { { + .name = "Channel layouts", .offset = offsetof(AVFilterFormatsConfig, channel_layouts), .merge = merge_channel_layouts, .can_merge = can_merge_channel_layouts, @@ -427,6 +432,7 @@ static const AVFilterFormatsMerger mergers_audio[] = { CONVERSION_FILTER_ARESAMPLE }, { + .name = "Sample rates", .offset = offsetof(AVFilterFormatsConfig, samplerates), .merge = merge_samplerates, .can_merge = can_merge_samplerates, @@ -434,6 +440,7 @@ static const AVFilterFormatsMerger mergers_audio[] = { CONVERSION_FILTER_ARESAMPLE }, { + .name = "Sample formats", .offset = offsetof(AVFilterFormatsConfig, formats), .merge = merge_sample_fmts, .can_merge = can_merge_sample_fmts, diff --git a/libavfilter/formats.h b/libavfilter/formats.h index 4fe96187ba..969bb230f1 100644 --- a/libavfilter/formats.h +++ b/libavfilter/formats.h @@ -516,6 +516,7 @@ int ff_formats_check_alpha_modes(void *log, const AVFilterFormats *fmts); struct AVBPrint; typedef struct AVFilterFormatMerger { + const char *name; unsigned offset; int (*merge)(void *a, void *b); int (*can_merge)(const void *a, const void *b);