diff --git a/README.md b/README.md index 6f3bbaa43a..4ce53a199e 100755 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ cd srs/trunk Step 2: build SRS, -Requires Centos6.x/Ubuntu12 32/64bits, others see Build([CN][v2_CN_Build],[EN][v2_EN_Build]). +Requires Centos6.x/Ubuntu12 32/64bits, for others OS recommend [docker][docker], see Build([CN][v2_CN_Build],[EN][v2_EN_Build]).
./configure && make @@ -982,6 +982,7 @@ Winlin [srs-librtmp]: https://github.com/ossrs/srs-librtmp [gitlab]: https://gitlab.com/winlinvip/srs-gitlab [console]: http://ossrs.net:1985/console +[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 79e7de0701..8f0922f488 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -681,6 +681,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