virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

avfilter/formats: add name field to AVFilterFormatMerger

Browse Source 
Needed to properly print format lists on format configuration failure.
This commit is contained in:
Niklas Haas
2025-11-06 17:58:10 +01:00
parent f5bc9704ed
commit ad5b151f88
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/formats.c
View File

@@ -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,

1
libavfilter/formats.h
View File

@@ -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);