History

Change thisIsAVar variable names to this_is_a_var style, more consistent with the rest of libav*.

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

Stefano Sabatini committed 17 years ago

Commit 7f9b3261 parent b8700271 file · +36 −36Browse files

Showing the changes to libavfilter/graphparser.c (1 of 1 file). Show all

Unified · Split

libavfilter/graphparser.c+36−36
@@ -211,13 +211,13 @@ static void insert_inout(AVFilterInOut **inouts, AVFilterInOut *element) · 210 unmodified lines
211211 }
212212
213213 static int link_filter_inouts(AVFilterContext *filter,
214− AVFilterInOut **currInputs,
215− AVFilterInOut **openInputs, AVClass *log_ctx)
214+ AVFilterInOut **curr_inputs,
215+ AVFilterInOut **open_inputs, AVClass *log_ctx)
216216 {
217217 int pad = filter->input_count;
218218
219219 while(pad--) {
220− AVFilterInOut *p = *currInputs;
220+ AVFilterInOut *p = *curr_inputs;
221221 if(!p) {
222222 av_log(log_ctx, AV_LOG_ERROR,
223223 "Not enough inputs specified for the \"%s\" filter.\n",
@@ -225,7 +225,7 @@ static int link_filter_inouts(AVFilterContext *filter, · 1 unmodified line
225225 return -1;
226226 }
227227
228− *currInputs = (*currInputs)->next;
228+ *curr_inputs = (*curr_inputs)->next;
229229
230230 if(p->filter) {
231231 if(link_filter(p->filter, p->pad_idx, filter, pad, log_ctx))
@@ -235,11 +235,11 @@ static int link_filter_inouts(AVFilterContext *filter, · 3 unmodified lines
235235 } else {
236236 p->filter = filter;
237237 p->pad_idx = pad;
238− insert_inout(openInputs, p);
238+ insert_inout(open_inputs, p);
239239 }
240240 }
241241
242− if(*currInputs) {
242+ if(*curr_inputs) {
243243 av_log(log_ctx, AV_LOG_ERROR,
244244 "Too many inputs specified for the \"%s\" filter.\n",
245245 filter->filter->name);
@@ -251,14 +251,14 @@ static int link_filter_inouts(AVFilterContext *filter, · 5 unmodified lines
251251 AVFilterInOut *currlinkn = av_mallocz(sizeof(AVFilterInOut));
252252 currlinkn->filter = filter;
253253 currlinkn->pad_idx = pad;
254− insert_inout(currInputs, currlinkn);
254+ insert_inout(curr_inputs, currlinkn);
255255 }
256256
257257 return 0;
258258 }
259259
260−static int parse_inputs(const char **buf, AVFilterInOut **currInputs,
261− AVFilterInOut **openOutputs, AVClass *log_ctx)
260+static int parse_inputs(const char **buf, AVFilterInOut **curr_inputs,
261+ AVFilterInOut **open_outputs, AVClass *log_ctx)
262262 {
263263 int pad = 0;
264264
@@ -269,8 +269,8 @@ static int parse_inputs(const char **buf, AVFilterInOut **currInputs, · 4 unmodified lines
269269 if(!name)
270270 return -1;
271271
272− /* First check if the label is not in the openOutputs list */
273− match = extract_inout(name, openOutputs);
272+ /* First check if the label is not in the open_outputs list */
273+ match = extract_inout(name, open_outputs);
274274
275275 if(match) {
276276 av_free(name);
@@ -281,7 +281,7 @@ static int parse_inputs(const char **buf, AVFilterInOut **currInputs, · 4 unmodified lines
281281 match->pad_idx = pad;
282282 }
283283
284− insert_inout(currInputs, match);
284+ insert_inout(curr_inputs, match);
285285
286286 *buf += consume_whitespace(*buf);
287287 pad++;
@@ -290,9 +290,9 @@ static int parse_inputs(const char **buf, AVFilterInOut **currInputs, · 2 unmodified lines
290290 return pad;
291291 }
292292
293−static int parse_outputs(const char **buf, AVFilterInOut **currInputs,
294− AVFilterInOut **openInputs,
295− AVFilterInOut **openOutputs, AVClass *log_ctx)
293+static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs,
294+ AVFilterInOut **open_inputs,
295+ AVFilterInOut **open_outputs, AVClass *log_ctx)
296296 {
297297 int pad = 0;
298298
@@ -300,14 +300,14 @@ static int parse_outputs(const char **buf, AVFilterInOut **currInputs, · 1 unmodified line
300300 char *name = parse_link_name(buf, log_ctx);
301301 AVFilterInOut *match;
302302
303− AVFilterInOut *input = *currInputs;
304− *currInputs = (*currInputs)->next;
303+ AVFilterInOut *input = *curr_inputs;
304+ *curr_inputs = (*curr_inputs)->next;
305305
306306 if(!name)
307307 return -1;
308308
309− /* First check if the label is not in the openInputs list */
310− match = extract_inout(name, openInputs);
309+ /* First check if the label is not in the open_inputs list */
310+ match = extract_inout(name, open_inputs);
311311
312312 if(match) {
313313 if(link_filter(input->filter, input->pad_idx,
@@ -318,9 +318,9 @@ static int parse_outputs(const char **buf, AVFilterInOut **currInputs, · 4 unmodified lines
318318 av_free(match);
319319 av_free(input);
320320 } else {
321− /* Not in the list, so add the first input as a openOutput */
321+ /* Not in the list, so add the first input as a open_output */
322322 input->name = name;
323− insert_inout(openOutputs, input);
323+ insert_inout(open_outputs, input);
324324 }
325325 *buf += consume_whitespace(*buf);
326326 pad++;
@@ -330,19 +330,19 @@ static int parse_outputs(const char **buf, AVFilterInOut **currInputs, · 3 unmodified lines
330330 }
331331
332332 int avfilter_parse_graph(AVFilterGraph *graph, const char *filters,
333− AVFilterInOut *openInputs,
334− AVFilterInOut *openOutputs, AVClass *log_ctx)
333+ AVFilterInOut *open_inputs,
334+ AVFilterInOut *open_outputs, AVClass *log_ctx)
335335 {
336336 int index = 0;
337337 char chr = 0;
338338
339− AVFilterInOut *currInputs = NULL;
339+ AVFilterInOut *curr_inputs = NULL;
340340
341341 do {
342342 AVFilterContext *filter;
343343 filters += consume_whitespace(filters);
344344
345− if(parse_inputs(&filters, &currInputs, &openOutputs, log_ctx) < 0)
345+ if(parse_inputs(&filters, &curr_inputs, &open_outputs, log_ctx) < 0)
346346 goto fail;
347347
348348 filter = parse_filter(&filters, graph, index, log_ctx);
@@ -350,24 +350,24 @@ int avfilter_parse_graph(AVFilterGraph *graph, const char *filters, · 1 unmodified line
350350 if(!filter)
351351 goto fail;
352352
353− if(filter->input_count == 1 && !currInputs && !index) {
353+ if(filter->input_count == 1 && !curr_inputs && !index) {
354354 /* First input can be omitted if it is "[in]" */
355355 const char *tmp = "[in]";
356− if(parse_inputs(&tmp, &currInputs, &openOutputs, log_ctx) < 0)
356+ if(parse_inputs(&tmp, &curr_inputs, &open_outputs, log_ctx) < 0)
357357 goto fail;
358358 }
359359
360− if(link_filter_inouts(filter, &currInputs, &openInputs, log_ctx) < 0)
360+ if(link_filter_inouts(filter, &curr_inputs, &open_inputs, log_ctx) < 0)
361361 goto fail;
362362
363− if(parse_outputs(&filters, &currInputs, &openInputs, &openOutputs,
363+ if(parse_outputs(&filters, &curr_inputs, &open_inputs, &open_outputs,
364364 log_ctx) < 0)
365365 goto fail;
366366
367367 filters += consume_whitespace(filters);
368368 chr = *filters++;
369369
370− if(chr == ';' && currInputs) {
370+ if(chr == ';' && curr_inputs) {
371371 av_log(log_ctx, AV_LOG_ERROR,
372372 "Could not find a output to link when parsing \"%s\"\n",
373373 filters - 1);
@@ -376,11 +376,11 @@ int avfilter_parse_graph(AVFilterGraph *graph, const char *filters, · 2 unmodified lines
376376 index++;
377377 } while(chr == ',' || chr == ';');
378378
379− if(openInputs && !strcmp(openInputs->name, "out") && currInputs) {
379+ if(open_inputs && !strcmp(open_inputs->name, "out") && curr_inputs) {
380380 /* Last output can be omitted if it is "[out]" */
381381 const char *tmp = "[out]";
382− if(parse_outputs(&tmp, &currInputs, &openInputs,
383− &openOutputs, log_ctx) < 0)
382+ if(parse_outputs(&tmp, &curr_inputs, &open_inputs,
383+ &open_outputs, log_ctx) < 0)
384384 goto fail;
385385 }
386386
@@ -388,8 +388,8 @@ int avfilter_parse_graph(AVFilterGraph *graph, const char *filters, · 1 unmodified line
388388
389389 fail:
390390 avfilter_destroy_graph(graph);
391− free_inout(openInputs);
392− free_inout(openOutputs);
393− free_inout(currInputs);
391+ free_inout(open_inputs);
392+ free_inout(open_outputs);
393+ free_inout(curr_inputs);
394394 return -1;
395395 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t