From f1033296bbdeb068e895fab550a02d83c7371767 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sat, 1 Dec 2018 20:21:35 +0800
Subject: [PATCH] Upgrade to FFMPEG 4.1 and X264 157. 2.0.261

---
 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 a3bd520e5..6f3bbaa43 100755
--- a/README.md
+++ b/README.md
@@ -335,6 +335,7 @@ Remark:
 
 ## History
 
+* v2.0, 2018-12-01, Merge [#1274][bug #1274], Upgrade to FFMPEG 4.1 and X264 157. 2.0.261
 * 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
 * <strong>v2.0, 2018-10-28, [2.0 release5(2.0.258)][r2.0r5] released. 86916 lines.</strong>
@@ -1339,6 +1340,7 @@ Winlin
 [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 #1274]: https://github.com/ossrs/srs/pull/1274
 [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 66c39960b..a2728fdc2 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    260
+#define VERSION_REVISION    261
 
 // generated by configure, only macros.
 #include <srs_auto_headers.hpp>