merge from 2.0

README.md

@@ -205,7 +205,7 @@ PRIMARY response in NetConnection.connect and metadata.
 newbie questions, and generally make SRS that much better.
 
 About all PRIMARY, AUTHORS and CONTRIBUTORS, read 
-[AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/master/AUTHORS.txt).
+[AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/develop/AUTHORS.txt).
 
 A big THANK YOU goes to:
 * [chnvideo](chnvideo.com) co-founders([wiseyoung](mailto:wiseyoung@chnvideo.com), [trueice](mailto:trueice@chnvideo.com), [leijian](mailto:leijian@chnvideo.com)) for [big supports](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product#bigthanks).

trunk/src/core/srs_core.hpp

@@ -53,6 +53,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define RTMP_SIG_SRS_VERSION __SRS_XSTR(VERSION_MAJOR)"."__SRS_XSTR(VERSION_MINOR)"."__SRS_XSTR(VERSION_REVISION)
 #define RTMP_SIG_SRS_SERVER RTMP_SIG_SRS_KEY"/"RTMP_SIG_SRS_VERSION"("RTMP_SIG_SRS_CODE")"
 
+// stable major version
+#define VERSION_STABLE 1
+#define VERSION_STABLE_BRANCH __SRS_XSTR(VERSION_STABLE)".0release"
+
 // internal macros, covert macro values to str,
 // see: read https://gcc.gnu.org/onlinedocs/cpp/Stringification.html#Stringification
 #define __SRS_XSTR(v) __SRS_STR(v)

trunk/src/main/srs_main_server.cpp

@@ -207,9 +207,9 @@ void check_macro_features()
 
     srs_trace("writev limits write %d iovs a time", sysconf(_SC_IOV_MAX));
 
-#if VERSION_MAJOR > 1
+#if VERSION_MAJOR > VERSION_STABLE
-    #warning "using develop SRS, please use release instead."
+    #warning "current branch is not stable, please use stable branch instead."
-    srs_warn("SRS %s is develop branch, please use %s instead", RTMP_SIG_SRS_VERSION, RTMP_SIG_SRS_RELEASE);
+    srs_warn("SRS %s is not stable, please use stable branch %s instead", RTMP_SIG_SRS_VERSION, VERSION_STABLE_BRANCH);
 #endif
 
 #if defined(SRS_AUTO_STREAM_CASTER)