From patchwork Wed Aug 10 08:15:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Burt P X-Patchwork-Id: 134 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp335320vsd; Wed, 10 Aug 2016 05:14:27 -0700 (PDT) X-Received: by 10.28.229.1 with SMTP id c1mr3240458wmh.0.1470831267320; Wed, 10 Aug 2016 05:14:27 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q1si5552804wja.276.2016.08.10.05.14.26; Wed, 10 Aug 2016 05:14:27 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6E53268A562; Wed, 10 Aug 2016 11:36:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f194.google.com (unknown [209.85.223.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71F4268A4A5 for ; Wed, 10 Aug 2016 11:29:13 +0300 (EEST) Received: by mail-io0-f194.google.com with SMTP id y34so2445291ioi.3 for ; Wed, 10 Aug 2016 01:29:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=YlMAtAC24Jeaq5eF+WO7k9UWrm1sZ6fJAyGJwc6UClY=; b=ja76+qPf2fIZEDL3D9EqNeZdG+UlxwLzZ+aESyyyk+W4nwh97Be7woE51whhwiZSSf xPiNVFca/WFQ0+steuuCCbNWUtnC5SIx9BYrHsanha7kZT9tDpXCF8pDHKnE83OqWkAt SQsOoDMOPdIiMfkD09ployLKy5kcPkPYyPqURT6d4yInfdh6qZsVf5A9Vj5uMpVV8AhF waSU1UepEc3rs5XXX8iW+It8S82YmYYaCvY2NxmCmd/5Cz869AtrcPKQLiReeU1LUlrx R4OTUVu3ePC/cbZfCb23OZ3RvuHJKuCz/Am160GQCFSwDcSih365QTwvUsM+sAIuHPsV WyCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=YlMAtAC24Jeaq5eF+WO7k9UWrm1sZ6fJAyGJwc6UClY=; b=VUwDzlc8u8D5sEcLSmnJBza8MC8sbGR2RkMK3lerMqPrzfAZI/5eaWSCj4NSepwfFx YbRDHXuxcgqI8WdTX9SCnj9jsmigPZ8DcZ3q4c0Jeq/ClPloYeRjcwk6Rw+Xmm5meORX wRRjoQaxt6Ht8fVzJlUjw1rsOkiUEaUhybHbYMDWMZwZ7yjAENKS1QeUlZ+TmQ3RbpFZ dTp7Ri/A4RK6OcG4Rtq9gdLXfwSFuly2vxBZ/wWLKCdJsc/hdecjrkBF5m79+atTKxMP kmB8RHJ2hIITkafrhcjHnkdadvrezSYT33wsBMTpSXzFiXcuTXs00H4rXJEERB8WVyzZ 9EEw== X-Gm-Message-State: AEkoousQmFkZAojoLRSABy/TVxycULTGvUqbL4H4JRXBIT2LdMMhNbGGXlP6M3XKhLmeSQ== X-Received: by 10.107.6.21 with SMTP id 21mr3710726iog.142.1470816954601; Wed, 10 Aug 2016 01:15:54 -0700 (PDT) Received: from localhost.localdomain ([216.16.66.181]) by smtp.gmail.com with ESMTPSA id 140sm3265601itl.4.2016.08.10.01.15.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Aug 2016 01:15:54 -0700 (PDT) From: Burt P To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Aug 2016 03:15:49 -0500 Message-Id: <1470816949-30574-1-git-send-email-pburt0@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] avfiltergraph.c: restore disabling of auto conversions X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Burt P --- 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: