Merge branch '2.0release' into develop

winlin
Commit 091b480ac9a44577f8b8739b3a20c3c7054cab85 091b480a 2 parents c1172c99 679583da
trunk/src/app/srs_app_ffmpeg.hpp
--- a/trunk/src/app/srs_app_ffmpeg.hpp
查看文件 @091b480
+++ b/trunk/src/app/srs_app_ffmpeg.hpp
查看文件 @091b480
@@ -45,7 +45,7 @@ class SrsFFMPEG
 {
 private:
     bool started;
-     // whether SIGINT send but need to wait or SIGKILL.
+     // whether SIGTERM send but need to wait or SIGKILL.
     bool fast_stopped;
     pid_t pid;
 private: