git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
80262d8
)
avfiltergraph.c: restore disabling of auto conversions
author
Burt P
<pburt0@gmail.com>
Wed, 10 Aug 2016 09:04:29 +0000
(
04:04
-0500)
committer
Burt P
<pburt0@gmail.com>
Wed, 10 Aug 2016 16:37:28 +0000
(11:37 -0500)
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>
libavfilter/avfiltergraph.c
patch
|
blob
|
history
diff --git
a/libavfilter/avfiltergraph.c
b/libavfilter/avfiltergraph.c
index
4275113
..
3af698d
100644
(file)
--- 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: