diff mbox

[FFmpeg-devel] avfiltergraph.c: restore disabling of auto conversions

Message ID 1470816949-30574-1-git-send-email-pburt0@gmail.com
State Superseded
Headers show

Commit Message

Burt P Aug. 10, 2016, 8:15 a.m. UTC 
Signed-off-by: Burt P <pburt0@gmail.com>
---
 libavfilter/avfiltergraph.c | 8 ++++++++
 1 file changed, 8 insertions(+)
diff mbox

Patch

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: