mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Merge SRS3
This commit is contained in:
commit
a51e275414
4 changed files with 4 additions and 8 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue