Remnant of old merge.
Unified · Split
| @@ -518,7 +518,6 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) · 517 unmodified lines | |||
| 518 | AVFilterContext *convert; | 518 | AVFilterContext *convert; |
| 519 | const AVFilter *filter; | 519 | const AVFilter *filter; |
| 520 | AVFilterLink *inlink, *outlink; | 520 | AVFilterLink *inlink, *outlink; |
| 521 | char scale_args[256]; | ||
| 522 | char inst_name[30]; | 521 | char inst_name[30]; |
| 523 | 522 | ||
| 524 | if (graph->disable_auto_convert) { | 523 | if (graph->disable_auto_convert) { |
| @@ -555,10 +554,6 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) · 30 unmodified lines | |||
| 555 | 554 | ||
| 556 | snprintf(inst_name, sizeof(inst_name), "auto_resampler_%d", | 555 | snprintf(inst_name, sizeof(inst_name), "auto_resampler_%d", |
| 557 | resampler_count++); | 556 | resampler_count++); |
| 558 | scale_args[0] = '\0'; | ||
| 559 | if (graph->aresample_swr_opts) | ||
| 560 | snprintf(scale_args, sizeof(scale_args), "%s", | ||
| 561 | graph->aresample_swr_opts); | ||
| 562 | if ((ret = avfilter_graph_create_filter(&convert, filter, | 557 | if ((ret = avfilter_graph_create_filter(&convert, filter, |
| 563 | inst_name, graph->aresample_swr_opts, | 558 | inst_name, graph->aresample_swr_opts, |
| 564 | NULL, graph)) < 0) | 559 | NULL, graph)) < 0) |