From patchwork Wed Aug 10 09:09:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Burt P X-Patchwork-Id: 133 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp327838vsd; Wed, 10 Aug 2016 04:59:20 -0700 (PDT) X-Received: by 10.194.31.68 with SMTP id y4mr4467154wjh.149.1470830360454; Wed, 10 Aug 2016 04:59:20 -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 q190si7694543wmg.61.2016.08.10.04.59.19; Wed, 10 Aug 2016 04:59:20 -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 2507F68A576; Wed, 10 Aug 2016 12:12:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f194.google.com (mail-io0-f194.google.com [209.85.223.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A409F68A4F1 for ; Wed, 10 Aug 2016 12:09:55 +0300 (EEST) Received: by mail-io0-f194.google.com with SMTP id y195so2504463iod.0 for ; Wed, 10 Aug 2016 02:09:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=dFVcmIDz55vyStLbzTjNBFSLRDEoshOyWB/c5aYC+Yg=; b=zquD+fO1IIB0OGYJeifGa/W0Z4Pzk/iI1/PnYXPfbC9DHYM+tBerFMF+qr4SAI6snJ eFlvUsZ728QL9v17LRxNdSagatm3o9BULUlHVEWG0AVrvtfnEcaaAxEZwe8u3rVUazHl W21neQUQt5lpmefc3hS17oYfzAoq7hiNpVxyC+oElhhkxEnyUuKTqaJxV3vxO7Cv593I mdawQckZNwzh4CJ2TN7ebzrGngRueKJqgRADY3KDsaKLDbnNLWt1EfNEVH9eW8SM18G/ 8bPGs41xZbn5Tc7KyKLR2pEQQrUsO6b5nAt7sHAzRrCPWF+3/jKIFd319iu0Q9Kd30hQ o0XQ== 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:in-reply-to :references; bh=dFVcmIDz55vyStLbzTjNBFSLRDEoshOyWB/c5aYC+Yg=; b=BpmtQngWBtteW3wbKNjnNKh40ZFQJcLhwiwqYubGt333w8TcMrNw3EXwek9mfkJLu8 O1tQIXgTPAoKPUUi+KCPxcyNB6hHvNN9C/n2ESxjpWLXy/miob3Ov/KYMsdQHBQQMdlp Kd0U7o1TtEek6LRPbe58lGTFx8HzEim6bLBPtNzfQa4M6jEYZJ3+4SVugawBETLmq3VC mFq04ifGPgkxDitrX3ob4QxGU8ZZ4OTFoBf1IAXYwad0iCisrW1v2aWyJ4rTrlRnlxtO CMEQxYqfBRoEbBQfgS9/MBRxSr5aUXGu1/2xjlIidCDZeB9fgjeFitjZ2T85uUFJtIAB HOqg== X-Gm-Message-State: AEkoousYpx6OI2nDszKu48PIzO/ZoJjbeoI/MQnSowQeWwqlCLvQmWTMRGL5HAvRPftf2A== X-Received: by 10.107.17.147 with SMTP id 19mr4472594ior.22.1470820192434; Wed, 10 Aug 2016 02:09:52 -0700 (PDT) Received: from localhost.localdomain ([216.16.66.181]) by smtp.gmail.com with ESMTPSA id a63sm18462350ioe.15.2016.08.10.02.09.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Aug 2016 02:09:51 -0700 (PDT) From: Burt P To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Aug 2016 04:09:48 -0500 Message-Id: <1470820188-31893-1-git-send-email-pburt0@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470816949-30574-1-git-send-email-pburt0@gmail.com> References: <1470816949-30574-1-git-send-email-pburt0@gmail.com> Subject: [FFmpeg-devel] [PATCHv2] 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" 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 --- libavfilter/avfiltergraph.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 4275113..3af698d 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: