Originally committed as revision 13354 to svn://svn.ffmpeg.org/ffmpeg/trunk
Showing the changes to libavfilter/graphparser.c (1 of 1 file). Show all
Unified · Split
| @@ -341,7 +341,6 @@ int avfilter_parse_graph(AVFilterGraph *graph, const char *filters, · 340 unmodified lines | ||
| 341 | 341 | { |
| 342 | 342 | int index = 0; |
| 343 | 343 | char chr = 0; |
| 344 | − int pad = 0; | |
| 345 | 344 | |
| 346 | 345 | AVFilterInOut *currInputs = NULL; |
| 347 | 346 | |
| @@ -349,9 +348,7 @@ int avfilter_parse_graph(AVFilterGraph *graph, const char *filters, · 1 unmodified line | ||
| 349 | 348 | AVFilterContext *filter; |
| 350 | 349 | filters += consume_whitespace(filters); |
| 351 | 350 | |
| 352 | − pad = parse_inputs(&filters, &currInputs, &openLinks, log_ctx); | |
| 353 | − | |
| 354 | − if(pad < 0) | |
| 351 | + if(parse_inputs(&filters, &currInputs, &openLinks, log_ctx) < 0) | |
| 355 | 352 | goto fail; |
| 356 | 353 | |
| 357 | 354 | filter = parse_filter(&filters, graph, index, log_ctx); |
| @@ -362,17 +359,14 @@ int avfilter_parse_graph(AVFilterGraph *graph, const char *filters, · 4 unmodified lines | ||
| 362 | 359 | if(filter->input_count == 1 && !currInputs && !index) { |
| 363 | 360 | // First input can be ommitted if it is "[in]" |
| 364 | 361 | const char *tmp = "[in]"; |
| 365 | − pad = parse_inputs(&tmp, &currInputs, &openLinks, log_ctx); | |
| 366 | − if(pad < 0) | |
| 362 | + if(parse_inputs(&tmp, &currInputs, &openLinks, log_ctx)) | |
| 367 | 363 | goto fail; |
| 368 | 364 | } |
| 369 | 365 | |
| 370 | 366 | if(link_filter_inouts(filter, &currInputs, &openLinks, log_ctx) < 0) |
| 371 | 367 | goto fail; |
| 372 | 368 | |
| 373 | − pad = parse_outputs(&filters, &currInputs, &openLinks, log_ctx); | |
| 374 | − | |
| 375 | − if(pad < 0) | |
| 369 | + if(parse_outputs(&filters, &currInputs, &openLinks, log_ctx)) | |
| 376 | 370 | goto fail; |
| 377 | 371 | |
| 378 | 372 | filters += consume_whitespace(filters); |