external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Allow FFmpeg if exists at /usr/local/bin/ffmpeg. 3.0.147

Browse source
This commit is contained in:
winlin 2020-10-23 21:32:57 +08:00
parent 1d92ff73fb
commit 6dc3d85ded
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/auto/options.sh
View file

@ -569,10 +569,6 @@ function check_option_conflicts() {
echo "Don't support building NGINX, please use docker https://github.com/ossrs/srs-docker"; exit -1;
fi
if [[ $SRS_FFMPEG_TOOL == YES ]]; then
echo "Don't support building FFMPEG, please use docker https://github.com/ossrs/srs-docker"; exit -1;
fi
# TODO: FIXME: check more os.
__check_ok=YES