X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Ffiltfmts.c;h=cc046542223ffb66063bf20577e5aa92f34fe52b;hb=40cf1bbacc6220a0aa6bed5c331871d43f9ce370;hp=69288af9a3ff15e535920503450ab6d2b21d1fcf;hpb=6756d98cec7dbeab6d407abc656d06d7ba97fdda;p=ffmpeg

diff --git a/libavfilter/filtfmts.c b/libavfilter/filtfmts.c
index 69288af9a3f..cc046542223 100644
--- a/libavfilter/filtfmts.c
+++ b/libavfilter/filtfmts.c
@@ -20,8 +20,9 @@
 
 #include <stdio.h>
 
-#include "libavformat/avformat.h"
+#include "libavutil/mem.h"
 #include "libavutil/pixdesc.h"
+
 #include "libavfilter/avfilter.h"
 #include "libavfilter/formats.h"
 
@@ -32,7 +33,7 @@ int main(int argc, char **argv)
     AVFilterGraph *graph_ctx;
     const char *filter_name;
     const char *filter_args = NULL;
-    int i, j;
+    int i, j, ret = 0;
 
     av_log_set_level(AV_LOG_DEBUG);
 
@@ -71,14 +72,24 @@ int main(int argc, char **argv)
     }
 
     /* create a link for each of the input pads */
-    for (i = 0; i < filter_ctx->input_count; i++) {
+    for (i = 0; i < filter_ctx->nb_inputs; i++) {
         AVFilterLink *link = av_mallocz(sizeof(AVFilterLink));
-        link->type = filter_ctx->filter->inputs[i].type;
+        if (!link) {
+            fprintf(stderr, "Unable to allocate memory for filter input link\n");
+            ret = 1;
+            goto fail;
+        }
+        link->type = avfilter_pad_get_type(filter_ctx->filter->inputs, i);
         filter_ctx->inputs[i] = link;
     }
-    for (i = 0; i < filter_ctx->output_count; i++) {
+    for (i = 0; i < filter_ctx->nb_outputs; i++) {
         AVFilterLink *link = av_mallocz(sizeof(AVFilterLink));
-        link->type = filter_ctx->filter->outputs[i].type;
+        if (!link) {
+            fprintf(stderr, "Unable to allocate memory for filter output link\n");
+            ret = 1;
+            goto fail;
+        }
+        link->type = avfilter_pad_get_type(filter_ctx->filter->outputs, i);
         filter_ctx->outputs[i] = link;
     }
 
@@ -88,25 +99,26 @@ int main(int argc, char **argv)
         ff_default_query_formats(filter_ctx);
 
     /* print the supported formats in input */
-    for (i = 0; i < filter_ctx->input_count; i++) {
+    for (i = 0; i < filter_ctx->nb_inputs; i++) {
         AVFilterFormats *fmts = filter_ctx->inputs[i]->out_formats;
         for (j = 0; j < fmts->nb_formats; j++)
             printf("INPUT[%d] %s: %s\n",
-                   i, filter_ctx->filter->inputs[i].name,
+                   i, avfilter_pad_get_name(filter_ctx->filter->inputs, i),
                    av_get_pix_fmt_name(fmts->formats[j]));
     }
 
     /* print the supported formats in output */
-    for (i = 0; i < filter_ctx->output_count; i++) {
+    for (i = 0; i < filter_ctx->nb_outputs; i++) {
         AVFilterFormats *fmts = filter_ctx->outputs[i]->in_formats;
         for (j = 0; j < fmts->nb_formats; j++)
             printf("OUTPUT[%d] %s: %s\n",
-                   i, filter_ctx->filter->outputs[i].name,
+                   i, avfilter_pad_get_name(filter_ctx->filter->outputs, i),
                    av_get_pix_fmt_name(fmts->formats[j]));
     }
 
+fail:
     avfilter_free(filter_ctx);
     avfilter_graph_free(&graph_ctx);
     fflush(stdout);
-    return 0;
+    return ret;
 }