mirror of https://git.ffmpeg.org/ffmpeg.git
avfiltergraph.c: restore disabling of auto conversions
Restore a check added in 440af105f2
but lost sometime after. avfilter_graph_set_auto_convert() will
have an effect once again.
Signed-off-by: Burt P <pburt0@gmail.com>
This commit is contained in:
parent
80262d8c86
commit
16ea0bca14
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue