From patchwork Sat Sep 10 20:54:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 536 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp921249vsd; Sat, 10 Sep 2016 13:55:04 -0700 (PDT) X-Received: by 10.194.229.34 with SMTP id sn2mr9586314wjc.117.1473540904482; Sat, 10 Sep 2016 13:55:04 -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 jk1si8654861wjb.221.2016.09.10.13.55.02; Sat, 10 Sep 2016 13:55:04 -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 5AA79689F59; Sat, 10 Sep 2016 23:54:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f65.google.com (mail-oi0-f65.google.com [209.85.218.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1DF57689EEC for ; Sat, 10 Sep 2016 23:54:43 +0300 (EEST) Received: by mail-oi0-f65.google.com with SMTP id u64so226585oia.1 for ; Sat, 10 Sep 2016 13:54:54 -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=WkiJyRqzz/8JXwUjOjhYmVK82oEeRv9oZVopYOjickE=; b=FoBfc6hWr8dxo6rmVXD/4D2KNMAC4uscODNInm0cIE/+T672MeZXSJLPWLbDQ09h5Q T+RBo9SOko81ZWS3+dW+ESZ5bSbvGXMOIjzu2Sj6vaaYUydftBO6P8ZPWnevA4J7uXVM V17j1uuMOTxTuRIUektoGxsh7/7gthO+GCh5hFQcQblyXWZT0VRC+PK2OGYlD5XrRMzQ 94l0HdM1jNxjZcIghlyUD4jpO/CV9U9vHBTmapFmngQsY+bwf+FapdmsNRDsL49O8QFq 1C5bLE1+7L8zhAI0H+4Httv9M1h/EVHwm8GWyCJFK0eKM0CLhw1tF4vefYKqnsN8Jh1Z a+JQ== 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=WkiJyRqzz/8JXwUjOjhYmVK82oEeRv9oZVopYOjickE=; b=L0FhIta/o1m4PaRZhEOtCywJqLtL7iDfN6HWWdzeBChFSjYFnEJqQxgm4tdosTgX5t 4bTGtYWQzjmt+V5a85aDw1Gj80lsZxaQoJp2UhpDze5/Ywa3m5vx8tq1QVDk3FaXxFiM 7Lk5+RRRpewyOCNxDhJ4LakiHoRFCVK+N7nT+nb/k8AXUyH3TFXd/uWzTs+tduVYdYFE hNJfTecaF2+Iimx8BmoSwQnnjdPliYUt6I9iSlwFzZGM0WnADgQa8mNXBSmvaHs9FyrH +BgKC8G7tYCWRUz9ZAqzLJm7vvljAE7wJ+X4VuZ2OiNbg6L0ZNxEQPcGAXz8ama+wlpS AfMw== X-Gm-Message-State: AE9vXwPSBFaY6n+yjoo0wVL+iCXh3ZVK91ccL/0z5w+kGyzS1GjUwY59tgIlk73vBbi/Vw== X-Received: by 10.202.49.66 with SMTP id x63mr15268251oix.7.1473540892746; Sat, 10 Sep 2016 13:54:52 -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 r124sm5749512itc.19.2016.09.10.13.54.51 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 10 Sep 2016 13:54:51 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Sep 2016 15:54:44 -0500 Message-Id: <20160910205445.63805-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.10.0 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 | 4 +--- ffmpeg_opt.c | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index d858407..111d844 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,8 +4328,6 @@ int main(int argc, char **argv) show_banner(argc, argv, options); - term_init(); - /* parse options and open all input/output files */ ret = ffmpeg_parse_options(argc, argv); if (ret < 0) diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 2ea09cf..4d3d4c4 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -3102,6 +3102,9 @@ int ffmpeg_parse_options(int argc, char **argv) goto fail; } + /* configure terminal and setup signal handlers */ + term_init(); + /* open input files */ ret = open_files(&octx.groups[GROUP_INFILE], "input", open_input_file); if (ret < 0) {