From 99aa249f3a336e19760329bab3d8c9db7de02d9b Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 11 Nov 2018 13:33:47 +0800 Subject: [PATCH] #1261, Support _definst_ for Wowza. 2.0.260 --- README.md | 2 ++ trunk/src/core/srs_core.hpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 00ed81e076..a3bd520e5e 100755 --- a/README.md +++ b/README.md @@ -335,6 +335,7 @@ Remark: ## History +* v2.0, 2018-11-11, Merge [#1261][bug #1261], Support `_definst_` for Wowza. 2.0.260 * v2.0, 2018-11-11, Merge [#1263][bug #1263], Fix string trim bug. 2.0.259 * v2.0, 2018-10-28, [2.0 release5(2.0.258)][r2.0r5] released. 86916 lines. * v2.0, 2018-10-28, Fix [#1250][bug #1250], Support build on OSX10.14 Mojave. 2.0.258 @@ -1337,6 +1338,7 @@ Winlin [bug #1236]: https://github.com/ossrs/srs/issues/1236 [bug #1250]: https://github.com/ossrs/srs/issues/1250 [bug #1263]: https://github.com/ossrs/srs/issues/1263 +[bug #1261]: https://github.com/ossrs/srs/issues/1261 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx [exo #828]: https://github.com/google/ExoPlayer/pull/828 diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 83642e4ce5..66c39960b0 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR 2 #define VERSION_MINOR 0 -#define VERSION_REVISION 259 +#define VERSION_REVISION 260 // generated by configure, only macros. #include