From patchwork Thu Sep 8 00:17:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 472 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp568895vsd; Wed, 7 Sep 2016 17:33:53 -0700 (PDT) X-Received: by 10.194.206.68 with SMTP id lm4mr1076658wjc.106.1473294833239; Wed, 07 Sep 2016 17:33:53 -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 tz9si32638239wjc.76.2016.09.07.17.33.52; Wed, 07 Sep 2016 17:33:53 -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 6E27368A20D; Thu, 8 Sep 2016 03:33:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f65.google.com (mail-it0-f65.google.com [209.85.214.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 59D0F68A14B for ; Thu, 8 Sep 2016 03:33:33 +0300 (EEST) Received: by mail-it0-f65.google.com with SMTP id e124so3007163ith.1 for ; Wed, 07 Sep 2016 17:33:43 -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=bVILxyOFxaOfdjvJ7JQCijrGT/3kcOtRZA5OwzTF704=; b=NVp0NNEfoRfBdqXro9xBdUoqvlV0O+4uAtTZOoqmC2rdOMZTLct7YABVbwTMIeEb5D XCu1qbvpwUz2sFobhs2KnCQp13WAQTBAqRPJDtOd4qb4/SOdmjiL8x2YlFey1WqIvWih 6X1cilj5QiSZW2fS/uw0Z/GHDLCrYLylbanFq8PS4IBHI1yw5ppIq+RAXk1bp+TXgWNT HO2o4PUlPzD3QHI709DcS9+QQ81EE2+qkvaRqOzIuDfFWeR4SRE4z2sJoHPh5705aHMP nREX6NVcaC8tGkDVx3nkg0EoYU25Ea7i236qhadcjvMtXNLdnQPWlRrpjrJFTDwAR3Wv L6gA== 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=bVILxyOFxaOfdjvJ7JQCijrGT/3kcOtRZA5OwzTF704=; b=lxUED00IviAc89MRMrYobZbRjWsEQj+KFDRbkUxcGNOxrzHzXk/bkQixDbF6RDmAVA 9a21aVlVjCTMoTqQ1fVvxSb8qaLFtfjG3lzrtyGPQ7HaGGqJLGrfGQbKrnMPgT8ktn6t zJSp1S8UCkpChHC+9mgf7I5PEulKy6qt06kW9JcdvQWgC0R/YrNbKmqSV1GcGZfkL8Mt lYbzsOu9kRE+uySOwjDuzx3l0GLRxULamY520KOZq8KmIMrz3bi5mEIRzrNXnzP1bsU8 FLIz82do3+4ZQVZZhz1V4lOKKOK3PH793UIQYpX7t/NKt9KSNunV6P0dTh7rlpfeU+i0 4+mQ== X-Gm-Message-State: AE9vXwMCNjSPlPFJ4zsobJCW/bpjxw4t5FZt2LTH4EnjSa+isD4e0GKalALsjy4uYE6VRg== X-Received: by 10.36.112.11 with SMTP id f11mr11524610itc.57.1473293887048; Wed, 07 Sep 2016 17:18:07 -0700 (PDT) Received: from Rodgers-MacBook-Pro.local.net (c-73-209-137-129.hsd1.il.comcast.net. [73.209.137.129]) by smtp.gmail.com with ESMTPSA id f9sm4775837itc.10.2016.09.07.17.18.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 07 Sep 2016 17:18:06 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Sep 2016 19:17:59 -0500 Message-Id: <20160908001800.91910-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH 1/2] ffmpeg: don't reconfigure terminal if we're not taking input from stdin 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" --- ffmpeg.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ffmpeg.c b/ffmpeg.c index d858407..1d793fe 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -366,7 +366,7 @@ static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType) void term_init(void) { #if HAVE_TERMIOS_H - if(!run_as_daemon){ + if (!run_as_daemon && stdin_interaction) { struct termios tty; if (tcgetattr (0, &tty) == 0) { oldtty = tty; @@ -4328,6 +4328,10 @@ int main(int argc, char **argv) show_banner(argc, argv, options); + ret = locate_option(argc, argv, options, "stdin"); + if (ret && !strcmp(argv[ret], "-nostdin")) + stdin_interaction = 0; + term_init(); /* parse options and open all input/output files */