[FFmpeg-devel] [PATCH] avfiltergraph.c: restore disabling of auto conversions
Burt P
pburt0 at gmail.com
Wed Aug 10 11:15:49 EEST 2016
Signed-off-by: Burt P <pburt0 at gmail.com>
---
libavfilter/avfiltergraph.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 4275113..1685b76 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(NULL, 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:
--
2.7.4
More information about the ffmpeg-devel
mailing list