From 55854883c89ed9d7d6ca290162747f0f1994a8b0 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Tue, 15 May 2018 12:14:21 +0200
Subject: [PATCH] *-exec: inputs now correctly throw away stderr, preventing
ffmpeg lockups
---
src/input/input_h264.cpp | 4 ++--
src/input/input_ts.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/input/input_h264.cpp b/src/input/input_h264.cpp
index 87f149be..bf950959 100644
--- a/src/input/input_h264.cpp
+++ b/src/input/input_h264.cpp
@@ -42,8 +42,8 @@ namespace Mist{
}
args[argCnt] = 0;
- int fin = -1, fout = -1, ferr = -1;
- inputProcess = Util::Procs::StartPiped(args, &fin, &fout, &ferr);
+ int fin = -1, fout = -1;
+ inputProcess = Util::Procs::StartPiped(args, &fin, &fout, 0);
myConn = Socket::Connection(-1, fout);
}else{
myConn = Socket::Connection(fileno(stdout), fileno(stdin));
diff --git a/src/input/input_ts.cpp b/src/input/input_ts.cpp
index 73f6e71d..bcdca873 100755
--- a/src/input/input_ts.cpp
+++ b/src/input/input_ts.cpp
@@ -208,8 +208,8 @@ namespace Mist {
}
args[argCnt] = 0;
- int fin = -1, fout = -1, ferr = -1;
- inputProcess = Util::Procs::StartPiped(args, &fin, &fout, &ferr);
+ int fin = -1, fout = -1;
+ inputProcess = Util::Procs::StartPiped(args, &fin, &fout, 0);
tcpCon = Socket::Connection(-1, fout);
return true;
}