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