[FFmpeg-devel] [PATCH 11/11] avfilter/vf_format: Deduplicate inputs

[Andreas Rheinhardt <andreas.rheinhardt@outlook.com>]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavfilter/vf_format.c | 18 ++++--------------
 1 file 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),
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".