diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-11-01 09:10:09 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-11-04 01:24:09 +0100 |
| commit | 8661b5e8f9e63d2775978f2aa3ee6fae4d515c53 (patch) | |
| tree | bb8486fca0b47d13123b6215f980f09d0afe904f | |
| parent | c32c1a18b9bbc342521853aca320e08d1c871fb3 (diff) | |
| download | ffmpeg-8661b5e8f9e63d2775978f2aa3ee6fae4d515c53.tar.gz | |
avfilter/vf_format: Deduplicate inputs
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavfilter/vf_format.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index 04c265f59f..1189bd61c2 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -144,9 +144,7 @@ static const AVOption options[] = { AVFILTER_DEFINE_CLASS_EXT(format, "(no)format", options); -#if CONFIG_FORMAT_FILTER - -static const AVFilterPad avfilter_vf_format_inputs[] = { +static const AVFilterPad inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, @@ -154,6 +152,7 @@ static const AVFilterPad avfilter_vf_format_inputs[] = { }, }; +#if CONFIG_FORMAT_FILTER const AVFilter ff_vf_format = { .name = "format", .description = NULL_IF_CONFIG_SMALL("Convert the input video to one of the specified pixel formats."), @@ -166,7 +165,7 @@ const AVFilter ff_vf_format = { .flags = AVFILTER_FLAG_METADATA_ONLY, - FILTER_INPUTS(avfilter_vf_format_inputs), + FILTER_INPUTS(inputs), FILTER_OUTPUTS(ff_video_default_filterpad), FILTER_QUERY_FUNC(query_formats), @@ -174,15 +173,6 @@ const AVFilter ff_vf_format = { #endif /* CONFIG_FORMAT_FILTER */ #if CONFIG_NOFORMAT_FILTER - -static const AVFilterPad avfilter_vf_noformat_inputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .get_buffer.video = ff_null_get_video_buffer, - }, -}; - const AVFilter ff_vf_noformat = { .name = "noformat", .description = NULL_IF_CONFIG_SMALL("Force libavfilter not to use any of the specified pixel formats for the input to the next filter."), @@ -195,7 +185,7 @@ const AVFilter ff_vf_noformat = { .flags = AVFILTER_FLAG_METADATA_ONLY, - FILTER_INPUTS(avfilter_vf_noformat_inputs), + FILTER_INPUTS(inputs), FILTER_OUTPUTS(ff_video_default_filterpad), FILTER_QUERY_FUNC(query_formats), |