Restore a check added in 440af105f2306d3c7b3b3f4d7530bab910d49cb9 but lost sometime after. avfilter_graph_set_auto_convert() will have an effect once again.
Unified · Split
| @@ -507,6 +507,14 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) · 506 unmodified lines | ||
| 507 | 507 | char scale_args[256]; |
| 508 | 508 | char inst_name[30]; |
| 509 | 509 | |
| 510 | + if (graph->disable_auto_convert) { | |
| 511 | + av_log(log_ctx, AV_LOG_ERROR, | |
| 512 | + "The filters '%s' and '%s' do not have a common format " | |
| 513 | + "and automatic conversion is disabled.\n", | |
| 514 | + link->src->name, link->dst->name); | |
| 515 | + return AVERROR(EINVAL); | |
| 516 | + } | |
| 517 | + | |
| 510 | 518 | /* couldn't merge format lists. auto-insert conversion filter */ |
| 511 | 519 | switch (link->type) { |
| 512 | 520 | case AVMEDIA_TYPE_VIDEO: |