diff --git a/README.md b/README.md index 5fcdffa67..3dc0c2d38 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ #Simple-RTMP-Server -SRS/2.0,开发代号:[ZhouGuowen](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product#release20) +SRS/3.0,开发代号:[OuXuli](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product#release30) SRS定位是运营级的互联网直播服务器集群,追求更好的概念完整性和最简单实现的代码。 @@ -569,6 +569,10 @@ Supported operating systems and hardware: ## History +## SRS 3.0 history + +* v3.0, 2015-03-15, fork srs2 and start srs3. 3.0.0 + ### SRS 2.0 history * v2.0, 2015-03-15, start [2.0release branch](https://github.com/winlinvip/simple-rtmp-server/tree/2.0release), 80773 lines. diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 6487b8637..18059bfc3 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -29,13 +29,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ // current release version -#define VERSION_MAJOR 2 +#define VERSION_MAJOR 3 #define VERSION_MINOR 0 -#define VERSION_REVISION 140 +#define VERSION_REVISION 0 // server info. #define RTMP_SIG_SRS_KEY "SRS" -#define RTMP_SIG_SRS_CODE "ZhouGuowen" +#define RTMP_SIG_SRS_CODE "OuXuli" #define RTMP_SIG_SRS_ROLE "origin/edge server" #define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(Simple RTMP Server)" #define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server"