Merge branch '2.0release' into develop

This commit is contained in:
winlin 2015-06-01 10:14:58 +08:00
commit 091b480ac9

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: