Rename the variable filter to filt_ctx in link_filter_inouts, as the variable denotes...

Less confusing.

Originally committed as revision 25694 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index fad8b7567f6faf88fb0708c03be3b39f19f8cfec..538d0a6cad6b497c8352486346eb6273c97f0a7e 100644 (file)
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -190,30 +190,30 @@ static void insert_inout(AVFilterInOut **inouts, AVFilterInOut *element)
     *inouts = element;
 }
 
-static int link_filter_inouts(AVFilterContext *filter,
+static int link_filter_inouts(AVFilterContext *filt_ctx,
                               AVFilterInOut **curr_inputs,
                               AVFilterInOut **open_inputs, AVClass *log_ctx)
 {
-    int pad = filter->input_count, ret;
+    int pad = filt_ctx->input_count, ret;
 
     while (pad--) {
         AVFilterInOut *p = *curr_inputs;
         if (!p) {
             av_log(log_ctx, AV_LOG_ERROR,
                    "Not enough inputs specified for the \"%s\" filter.\n",
-                   filter->filter->name);
+                   filt_ctx->filter->name);
             return AVERROR(EINVAL);
         }
 
         *curr_inputs = (*curr_inputs)->next;
 
         if (p->filter) {
-            if ((ret = link_filter(p->filter, p->pad_idx, filter, pad, log_ctx)) < 0)
+            if ((ret = link_filter(p->filter, p->pad_idx, filt_ctx, pad, log_ctx)) < 0)
                 return ret;
             av_free(p->name);
             av_free(p);
         } else {
-            p->filter = filter;
+            p->filter = filt_ctx;
             p->pad_idx = pad;
             insert_inout(open_inputs, p);
         }
@@ -222,14 +222,14 @@ static int link_filter_inouts(AVFilterContext *filter,
     if (*curr_inputs) {
         av_log(log_ctx, AV_LOG_ERROR,
                "Too many inputs specified for the \"%s\" filter.\n",
-               filter->filter->name);
+               filt_ctx->filter->name);
         return AVERROR(EINVAL);
     }
 
-    pad = filter->output_count;
+    pad = filt_ctx->output_count;
     while (pad--) {
         AVFilterInOut *currlinkn = av_mallocz(sizeof(AVFilterInOut));
-        currlinkn->filter  = filter;
+        currlinkn->filter  = filt_ctx;
         currlinkn->pad_idx = pad;
         insert_inout(curr_inputs, currlinkn);
     }