diff options
| author | Burt P <pburt0@gmail.com> | 2016-08-10 04:04:29 -0500 |
|---|---|---|
| committer | Burt P <pburt0@gmail.com> | 2016-08-10 11:37:28 -0500 |
| commit | 16ea0bca14730d71dd319b7dc148598275928cfe (patch) | |
| tree | ca241c181b2e17c714cda12e817f104e8c966867 | |
| parent | 80262d8c86e94ff9a4bb3a9e3c2d734e04ccb399 (diff) | |
| download | ffmpeg-16ea0bca14730d71dd319b7dc148598275928cfe.tar.gz | |
avfiltergraph.c: restore disabling of auto conversions
Restore a check added in 440af105f2306d3c7b3b3f4d7530bab910d49cb9
but lost sometime after. avfilter_graph_set_auto_convert() will
have an effect once again.
Signed-off-by: Burt P <pburt0@gmail.com>
| -rw-r--r-- | libavfilter/avfiltergraph.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 42751132af..3af698d4be 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -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: |