Browse code

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

Less confusing.

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

Stefano Sabatini authored on 2010/11/08 03:40:01
Showing 1 changed files
... ...
@@ -190,30 +190,30 @@ static void insert_inout(AVFilterInOut **inouts, AVFilterInOut *element)
190 190
     *inouts = element;
191 191
 }
192 192
 
193
-static int link_filter_inouts(AVFilterContext *filter,
193
+static int link_filter_inouts(AVFilterContext *filt_ctx,
194 194
                               AVFilterInOut **curr_inputs,
195 195
                               AVFilterInOut **open_inputs, AVClass *log_ctx)
196 196
 {
197
-    int pad = filter->input_count, ret;
197
+    int pad = filt_ctx->input_count, ret;
198 198
 
199 199
     while (pad--) {
200 200
         AVFilterInOut *p = *curr_inputs;
201 201
         if (!p) {
202 202
             av_log(log_ctx, AV_LOG_ERROR,
203 203
                    "Not enough inputs specified for the \"%s\" filter.\n",
204
-                   filter->filter->name);
204
+                   filt_ctx->filter->name);
205 205
             return AVERROR(EINVAL);
206 206
         }
207 207
 
208 208
         *curr_inputs = (*curr_inputs)->next;
209 209
 
210 210
         if (p->filter) {
211
-            if ((ret = link_filter(p->filter, p->pad_idx, filter, pad, log_ctx)) < 0)
211
+            if ((ret = link_filter(p->filter, p->pad_idx, filt_ctx, pad, log_ctx)) < 0)
212 212
                 return ret;
213 213
             av_free(p->name);
214 214
             av_free(p);
215 215
         } else {
216
-            p->filter = filter;
216
+            p->filter = filt_ctx;
217 217
             p->pad_idx = pad;
218 218
             insert_inout(open_inputs, p);
219 219
         }
... ...
@@ -222,14 +222,14 @@ static int link_filter_inouts(AVFilterContext *filter,
222 222
     if (*curr_inputs) {
223 223
         av_log(log_ctx, AV_LOG_ERROR,
224 224
                "Too many inputs specified for the \"%s\" filter.\n",
225
-               filter->filter->name);
225
+               filt_ctx->filter->name);
226 226
         return AVERROR(EINVAL);
227 227
     }
228 228
 
229
-    pad = filter->output_count;
229
+    pad = filt_ctx->output_count;
230 230
     while (pad--) {
231 231
         AVFilterInOut *currlinkn = av_mallocz(sizeof(AVFilterInOut));
232
-        currlinkn->filter  = filter;
232
+        currlinkn->filter  = filt_ctx;
233 233
         currlinkn->pad_idx = pad;
234 234
         insert_inout(curr_inputs, currlinkn);
235 235
     }