diff --git a/README.md b/README.md
index d90009bd9..649dfba7c 100755
--- a/README.md
+++ b/README.md
@@ -235,6 +235,7 @@ Please select according to languages:
 
 ### V2 changes
 
+* 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>
@@ -1465,6 +1466,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
 
 [bug #735]: https://github.com/ossrs/srs/issues/735
diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh
index 6a3ec550c..98928ebf6 100755
--- a/trunk/auto/options.sh
+++ b/trunk/auto/options.sh
@@ -81,6 +81,7 @@ SRS_VALGRIND=NO
 SRS_X86_X64=NO
 # for osx system
 SRS_OSX=NO
+SRS_ALLOW_OSX=NO
 # armhf(v7cpu) built on ubuntu12
 SRS_ARM_UBUNTU12=NO
 # mips built on ubuntu12
@@ -277,6 +278,7 @@ function parse_user_option() {
         --x86-x64)                      SRS_X86_X64=YES             ;;
         --x86-64)                       SRS_X86_X64=YES             ;;
         --osx)                          SRS_OSX=YES                 ;;
+        --allow-osx)                    SRS_ALLOW_OSX=YES           ;;
         --arm)                          SRS_ARM_UBUNTU12=YES        ;;
         --mips)                         SRS_MIPS_UBUNTU12=YES       ;;
         --pi)                           SRS_PI=YES                  ;;
@@ -867,7 +869,7 @@ function check_option_conflicts() {
         exit 1;
     fi
 
-    if [[ $SRS_OSX == YES ]]; then
+    if [[ $SRS_OSX == YES && $SRS_ALLOW_OSX == NO ]]; then
         macOSVersion=`sw_vers -productVersion`
         macOSVersionMajor=`echo $macOSVersion|awk -F '.' '{print $1}'`
         macOSVersionMinor=`echo $macOSVersion|awk -F '.' '{print $2}'`