hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*-exec: inputs now correctly throw away stderr, preventing ffmpeg lockups

Browse source
This commit is contained in:
Thulinma 2018-05-15 12:14:21 +02:00
parent a084005644
commit 55854883c8
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/input/input_h264.cpp
View file

@ -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));

4
src/input/input_ts.cpp
View file

@ -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;
}