[FFmpeg-devel] [PATCH 3/4] avfilter/avfilter, fftools/cmdutils: Switch to AVFilter.nb_(in|out)puts

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
 fftools/cmdutils.c     | 6 +++---
 libavfilter/avfilter.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
index 96d38803df..24bcdc6b62 100644
--- a/fftools/cmdutils.c
+++ b/fftools/cmdutils.c
@@ -1713,7 +1713,7 @@ int show_filters(void *optctx, const char *opt, const char *arg)
                 *(descr_cur++) = '>';
             }
             pad = i ? filter->outputs : filter->inputs;
-            nb_pads = avfilter_pad_count(pad);
+            nb_pads = i ? filter->nb_outputs : filter->nb_inputs;
             for (j = 0; j < nb_pads; j++) {
                 if (descr_cur >= descr + sizeof(descr) - 4)
                     break;
@@ -1949,7 +1949,7 @@ static void show_help_filter(const char *name)
         printf("    slice threading supported\n");
 
     printf("    Inputs:\n");
-    count = avfilter_pad_count(f->inputs);
+    count = f->nb_inputs;
     for (i = 0; i < count; i++) {
         printf("       #%d: %s (%s)\n", i, avfilter_pad_get_name(f->inputs, i),
                media_type_string(avfilter_pad_get_type(f->inputs, i)));
@@ -1960,7 +1960,7 @@ static void show_help_filter(const char *name)
         printf("        none (source filter)\n");
 
     printf("    Outputs:\n");
-    count = avfilter_pad_count(f->outputs);
+    count = f->nb_outputs;
     for (i = 0; i < count; i++) {
         printf("       #%d: %s (%s)\n", i, avfilter_pad_get_name(f->outputs, i),
                media_type_string(avfilter_pad_get_type(f->outputs, i)));
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 85fbba8080..fc6023a97c 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -663,7 +663,7 @@ AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name)
         goto err;
     ret->internal->execute = default_execute;
 
-    ret->nb_inputs = avfilter_pad_count(filter->inputs);
+    ret->nb_inputs = filter->nb_inputs;
     if (ret->nb_inputs ) {
         ret->input_pads   = av_memdup(filter->inputs,  ret->nb_inputs  * sizeof(*filter->inputs));
         if (!ret->input_pads)
@@ -673,7 +673,7 @@ AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name)
             goto err;
     }
 
-    ret->nb_outputs = avfilter_pad_count(filter->outputs);
+    ret->nb_outputs = filter->nb_outputs;
     if (ret->nb_outputs) {
         ret->output_pads  = av_memdup(filter->outputs, ret->nb_outputs * sizeof(*filter->outputs));
         if (!ret->output_pads)
-- 
2.30.2