Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavfilter / graphparser.c

diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index e1d6ec2cf79ddb6dfdfe62b9a6c8195848c7a1a9..ba5d9b05a25804a57cb6cb819edd30101c2f1fcc 100644 (file)
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -226,12 +226,13 @@ static int link_filter_inouts(AVFilterContext *filt_ctx,
 {
     int pad, ret;
 
-    for (pad = 0; pad < filt_ctx->input_count; pad++) {
+    for (pad = 0; pad < filt_ctx->nb_inputs; pad++) {
         AVFilterInOut *p = *curr_inputs;
 
-        if (p)
+        if (p) {
             *curr_inputs = (*curr_inputs)->next;
-        else if (!(p = av_mallocz(sizeof(*p))))
+            p->next = NULL;
+        } else if (!(p = av_mallocz(sizeof(*p))))
             return AVERROR(ENOMEM);
 
         if (p->filter_ctx) {
@@ -253,7 +254,7 @@ static int link_filter_inouts(AVFilterContext *filt_ctx,
         return AVERROR(EINVAL);
     }
 
-    pad = filt_ctx->output_count;
+    pad = filt_ctx->nb_outputs;
     while (pad--) {
         AVFilterInOut *currlinkn = av_mallocz(sizeof(AVFilterInOut));
         if (!currlinkn)