Merge branch '2.0release' into develop

2015-06-01 10:14:58 +08:00 · 2015-06-01 10:14:58 +08:00 · 091b480ac9
commit 091b480ac9
parent c1172c9940 679583dad6
1 changed files with 1 additions and 1 deletions
--- a/trunk/src/app/srs_app_ffmpeg.hpp
+++ b/trunk/src/app/srs_app_ffmpeg.hpp
@ -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: