diff --git a/README.md b/README.md index 93d739436..f66f21240 100755 --- a/README.md +++ b/README.md @@ -201,6 +201,7 @@ For previous versions, please read: ## V3 changes +* v3.0, 2020-10-23, Allow FFmpeg if exists at /usr/local/bin/ffmpeg. 3.0.147 * v3.0, 2020-10-23, Refine build script, use libssl in docker. 3.0.146 * v3.0, 2020-10-14, Fix [#1987][bug #1987], Fix Kbps resample bug. 3.0.145 * v3.0, 2020-10-10, [3.0 release1(3.0.144)][r3.0r1] released. 122674 lines. diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 5e4b29c32..a66069f73 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -649,7 +649,7 @@ fi # live transcoding, ffmpeg-4.1, x264-core157, lame-3.99.5, libaacplus-2.0.2. ##################################################################################### # Always link the ffmpeg tools if exists. -if [[ -f /usr/local/bin/ffmpeg && ! -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]]; then +if [[ -f /usr/local/bin/ffmpeg && ! -f ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg ]]; then mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg/bin && ln -sf /usr/local/bin/ffmpeg ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg/bin/ffmpeg && (cd ${SRS_OBJS} && rm -rf ffmpeg && ln -sf ${SRS_PLATFORM}/ffmpeg) @@ -662,6 +662,7 @@ if [ $SRS_FFMPEG_TOOL = YES ]; then echo " please copy it from srs-docker"; echo " or download from http://ffmpeg.org/download.html"; echo " or disable it by --without-ffmpeg"; + exit -1; fi # Always update the links. if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg ]]; then diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index d3a6111c6..6aecb5ac2 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -590,12 +590,6 @@ function check_option_conflicts() { SRS_NGINX=NO fi - # For OSX, recommend to use DTrace, https://blog.csdn.net/win_lin/article/details/53503869 - if [[ $SRS_OSX == YES && $SRS_GPROF == YES ]]; then - echo "Tool gprof for OSX is unavailable, please use dtrace, read https://blog.csdn.net/win_lin/article/details/53503869" - exit -1 - fi - # TODO: FIXME: check more os. __check_ok=YES diff --git a/trunk/src/core/srs_core_version3.hpp b/trunk/src/core/srs_core_version3.hpp index 4f18f8a52..b29289a07 100644 --- a/trunk/src/core/srs_core_version3.hpp +++ b/trunk/src/core/srs_core_version3.hpp @@ -24,6 +24,6 @@ #ifndef SRS_CORE_VERSION3_HPP #define SRS_CORE_VERSION3_HPP -#define SRS_VERSION3_REVISION 146 +#define SRS_VERSION3_REVISION 147 #endif