* commit '096696ef0dd391d9430376d1444c1a3cde9171fd': avfiltergraph: simplify inserting conversion filters. Clarify output of av_get_bits_per_pixel
Showing the changes to libavfilter/avfiltergraph.c (1 of 2 files). Show all
Unified · Split
| @@ -406,13 +406,9 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) · 405 unmodified lines | |||
| 406 | 406 | ||
| 407 | snprintf(inst_name, sizeof(inst_name), "auto-inserted scaler %d", | 407 | snprintf(inst_name, sizeof(inst_name), "auto-inserted scaler %d", |
| 408 | scaler_count++); | 408 | scaler_count++); |
| 409 | av_strlcpy(scale_args, "0:0", sizeof(scale_args)); | 409 | |
| 410 | if (graph->scale_sws_opts) { | ||
| 411 | av_strlcat(scale_args, ":", sizeof(scale_args)); | ||
| 412 | av_strlcat(scale_args, graph->scale_sws_opts, sizeof(scale_args)); | ||
| 413 | } | ||
| 414 | if ((ret = avfilter_graph_create_filter(&convert, filter, | 410 | if ((ret = avfilter_graph_create_filter(&convert, filter, |
| 415 | inst_name, scale_args, NULL, | 411 | inst_name, graph->scale_sws_opts, NULL, |
| 416 | graph)) < 0) | 412 | graph)) < 0) |
| 417 | return ret; | 413 | return ret; |
| 418 | break; | 414 | break; |