Browse Source

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>
tags/n3.2
Burt P 9 years ago
parent
commit
16ea0bca14
1 changed files with 8 additions and 0 deletions
  1. +8
    -0
      libavfilter/avfiltergraph.c

+ 8
- 0
libavfilter/avfiltergraph.c View File

@@ -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…
Cancel
Save