From dd138897728a2fd68a7f372bc168a37e8435453e Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 3 Aug 2020 19:33:34 +0800 Subject: [PATCH] BUILD: Compatible with 3.0 options, ignore it --- trunk/auto/depends.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index c42542d8f..d646dbf33 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -666,14 +666,15 @@ if [ $SRS_FFMPEG_TOOL = YES ]; then if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg/bin/ffmpeg ]]; then echo "ffmpeg-4.1 is ok."; else - echo "Error: no FFmpeg found at /usr/local/bin/ffmpeg"; + echo "Warning: No FFmpeg found at /usr/local/bin/ffmpeg"; 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. - (cd ${SRS_OBJS} && rm -rf ffmpeg && ln -sf ${SRS_PLATFORM}/ffmpeg) + if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg ]]; then + (cd ${SRS_OBJS} && rm -rf ffmpeg && ln -sf ${SRS_PLATFORM}/ffmpeg) + fi fi #####################################################################################