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

Merge branch 'feature/rtc' into develop

Browse source
This commit is contained in:
winlin 2020-06-24 13:46:12 +08:00
commit 7c572dbae3
13 changed files with 153 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/auto/depends.sh
View file

@ -595,7 +595,7 @@ fi
#####################################################################################
# ffmpeg-fix, for WebRTC to transcode AAC with Opus.
#####################################################################################
if [[ $SRS_RTC == YES ]]; then
if [[ $SRS_FFMPEG_FIT == YES ]]; then
FFMPEG_OPTIONS=""
# If disable nasm, disable all ASMs.