external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-06-01 10:14:58 +08:00
commit 091b480ac9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_ffmpeg.hpp
View file

@ -45,7 +45,7 @@ class SrsFFMPEG
{ {
private: private:
bool started; bool started;
// whether SIGINT send but need to wait or SIGKILL. // whether SIGTERM send but need to wait or SIGKILL.
bool fast_stopped; bool fast_stopped;
pid_t pid; pid_t pid;
private: private: