From 9859fa9e6ffe968da7cd59d3b236ff19871441f4 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Mon, 8 Oct 2018 07:09:31 +0800
Subject: [PATCH] Merge #1237, Support param for transcoder. 2.0.256

---
 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 0250519e5..cb25e4a4d 100755
--- a/README.md
+++ b/README.md
@@ -334,6 +334,7 @@ Remark:
 
 ## History
 
+* v2.0, 2018-10-08, Merge [#1237][bug #1237], Support param for transcoder. 2.0.256
 * <strong>v2.0, 2018-08-12, [2.0 release4(2.0.255)][r2.0r4] released. 86915 lines.</strong>
 * v2.0, 2018-08-12, For [#1202][bug #1202], Support edge/forward to Aliyun CDN. 2.0.255 
 * v2.0, 2018-08-11, For [#910][bug #910], Support HTTP FLV with HTTP callback. 2.0.254
@@ -1327,6 +1328,7 @@ Winlin
 [bug #1110]: https://github.com/ossrs/srs/issues/1110
 [bug #910]: https://github.com/ossrs/srs/issues/910
 [bug #1202]: https://github.com/ossrs/srs/issues/1202
+[bug #1237]: https://github.com/ossrs/srs/issues/1237
 [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 af8692193..841780e18 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    255
+#define VERSION_REVISION    256
 
 // generated by configure, only macros.
 #include <srs_auto_headers.hpp>