Originally committed as revision 13355 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -231,7 +231,6 @@ static int link_filter_inouts(AVFilterContext *filter, · 230 unmodified lines | |||
| 231 | } | 231 | } |
| 232 | } | 232 | } |
| 233 | 233 | ||
| 234 | |||
| 235 | if(*currInputs) { | 234 | if(*currInputs) { |
| 236 | av_log(log_ctx, AV_LOG_ERROR, | 235 | av_log(log_ctx, AV_LOG_ERROR, |
| 237 | "Too many inputs specified for the \"%s\" filter.\n", | 236 | "Too many inputs specified for the \"%s\" filter.\n", |
| @@ -357,7 +356,7 @@ int avfilter_parse_graph(AVFilterGraph *graph, const char *filters, · 119 unmodified lines | |||
| 357 | goto fail; | 356 | goto fail; |
| 358 | 357 | ||
| 359 | if(filter->input_count == 1 && !currInputs && !index) { | 358 | if(filter->input_count == 1 && !currInputs && !index) { |
| 360 | // First input can be ommitted if it is "[in]" | 359 | /* First input can be ommitted if it is "[in]" */ |
| 361 | const char *tmp = "[in]"; | 360 | const char *tmp = "[in]"; |
| 362 | if(parse_inputs(&tmp, &currInputs, &openLinks, log_ctx)) | 361 | if(parse_inputs(&tmp, &currInputs, &openLinks, log_ctx)) |
| 363 | goto fail; | 362 | goto fail; |
| @@ -382,7 +381,7 @@ int avfilter_parse_graph(AVFilterGraph *graph, const char *filters, · 18 unmodified lines | |||
| 382 | } while(chr == ',' || chr == ';'); | 381 | } while(chr == ',' || chr == ';'); |
| 383 | 382 | ||
| 384 | if(openLinks && !strcmp(openLinks->name, "out") && currInputs) { | 383 | if(openLinks && !strcmp(openLinks->name, "out") && currInputs) { |
| 385 | // Last output can be ommitted if it is "[out]" | 384 | /* Last output can be ommitted if it is "[out]" */ |
| 386 | const char *tmp = "[out]"; | 385 | const char *tmp = "[out]"; |
| 387 | if(parse_outputs(&tmp, &currInputs, &openLinks, log_ctx) < 0) | 386 | if(parse_outputs(&tmp, &currInputs, &openLinks, log_ctx) < 0) |
| 388 | goto fail; | 387 | goto fail; |