diff --git a/README.md b/README.md index 649dfba7c4..82195ea55f 100755 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ cd srs/trunk ./configure && make ``` -> Remark: Recommend Centos6 64bits, for other OS please read wiki([CN][v3_CN_Build],[EN][v3_EN_Build]). +> Remark: Recommend Centos6 64bits, for other OS recommend [docker][docker], please read wiki([CN][v3_CN_Build],[EN][v3_EN_Build]). > Note: If you have multiple cores such as 4 cores CPU, please use `./configure --jobs=4 && make --jobs=4` to speeed up the build. @@ -1079,6 +1079,7 @@ Winlin [console]: http://ossrs.net:1985/console [player]: http://ossrs.net/players/srs_player.html [modules]: https://github.com/ossrs/srs/blob/develop/trunk/modules/readme.txt +[docker]: https://github.com/ossrs/srs-docker/tree/centos#usage [v1_CN_Git]: https://github.com/ossrs/srs/wiki/v1_CN_Git [v1_EN_Git]: https://github.com/ossrs/srs/wiki/v1_EN_Git diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index de6a2be888..f6c90f28d9 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -674,6 +674,9 @@ fi # live transcoding, ffmpeg-4.1, x264-core157, lame-3.99.5, libaacplus-2.0.2. ##################################################################################### if [ $SRS_FFMPEG_TOOL = YES ]; then + if [[ -f /usr/local/bin/ffmpeg && ! -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]]; then + mkdir -p ${SRS_OBJS}/ffmpeg/bin && ln -sf /usr/local/bin/ffmpeg ${SRS_OBJS}/ffmpeg/bin/ffmpeg + fi if [[ -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]]; then echo "ffmpeg-4.1 is ok."; else