mirror of https://git.ffmpeg.org/ffmpeg.git
avfilter/vf_format: Deduplicate inputs
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
c32c1a18b9
commit
8661b5e8f9
|
@ -144,9 +144,7 @@ static const AVOption options[] = {
|
||||||
|
|
||||||
AVFILTER_DEFINE_CLASS_EXT(format, "(no)format", options);
|
AVFILTER_DEFINE_CLASS_EXT(format, "(no)format", options);
|
||||||
|
|
||||||
#if CONFIG_FORMAT_FILTER
|
static const AVFilterPad inputs[] = {
|
||||||
|
|
||||||
static const AVFilterPad avfilter_vf_format_inputs[] = {
|
|
||||||
{
|
{
|
||||||
.name = "default",
|
.name = "default",
|
||||||
.type = AVMEDIA_TYPE_VIDEO,
|
.type = AVMEDIA_TYPE_VIDEO,
|
||||||
|
@ -154,6 +152,7 @@ static const AVFilterPad avfilter_vf_format_inputs[] = {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#if CONFIG_FORMAT_FILTER
|
||||||
const AVFilter ff_vf_format = {
|
const AVFilter ff_vf_format = {
|
||||||
.name = "format",
|
.name = "format",
|
||||||
.description = NULL_IF_CONFIG_SMALL("Convert the input video to one of the specified pixel formats."),
|
.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,
|
.flags = AVFILTER_FLAG_METADATA_ONLY,
|
||||||
|
|
||||||
FILTER_INPUTS(avfilter_vf_format_inputs),
|
FILTER_INPUTS(inputs),
|
||||||
FILTER_OUTPUTS(ff_video_default_filterpad),
|
FILTER_OUTPUTS(ff_video_default_filterpad),
|
||||||
|
|
||||||
FILTER_QUERY_FUNC(query_formats),
|
FILTER_QUERY_FUNC(query_formats),
|
||||||
|
@ -174,15 +173,6 @@ const AVFilter ff_vf_format = {
|
||||||
#endif /* CONFIG_FORMAT_FILTER */
|
#endif /* CONFIG_FORMAT_FILTER */
|
||||||
|
|
||||||
#if CONFIG_NOFORMAT_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 = {
|
const AVFilter ff_vf_noformat = {
|
||||||
.name = "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."),
|
.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,
|
.flags = AVFILTER_FLAG_METADATA_ONLY,
|
||||||
|
|
||||||
FILTER_INPUTS(avfilter_vf_noformat_inputs),
|
FILTER_INPUTS(inputs),
|
||||||
FILTER_OUTPUTS(ff_video_default_filterpad),
|
FILTER_OUTPUTS(ff_video_default_filterpad),
|
||||||
|
|
||||||
FILTER_QUERY_FUNC(query_formats),
|
FILTER_QUERY_FUNC(query_formats),
|
||||||
|
|
Loading…
Reference in New Issue