Commit 16ea0bca authored by Burt P's avatar Burt P

avfiltergraph.c: restore disabling of auto conversions

Restore a check added in 440af105
but lost sometime after. avfilter_graph_set_auto_convert() will
have an effect once again.
Signed-off-by: 's avatarBurt P <pburt0@gmail.com>
parent 80262d8c
......@@ -507,6 +507,14 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
char scale_args[256];
char inst_name[30];
if (graph->disable_auto_convert) {
av_log(log_ctx, AV_LOG_ERROR,
"The filters '%s' and '%s' do not have a common format "
"and automatic conversion is disabled.\n",
link->src->name, link->dst->name);
return AVERROR(EINVAL);
}
/* couldn't merge format lists. auto-insert conversion filter */
switch (link->type) {
case AVMEDIA_TYPE_VIDEO:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment