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

Merge branch '4.0release' into merge/develop

This commit is contained in:
winlin 2021-05-18 09:10:11 +08:00
commit cc56102c9e
12 changed files with 70 additions and 23 deletions

7
trunk/configure vendored
View file

@ -283,13 +283,10 @@ if [[ $SRS_FFMPEG_FIT == YES ]]; then
MODULE_FILES+=("srs_app_rtc_codec")
fi
if [[ $SRS_GB28181 == YES ]]; then
MODULE_FILES+=("srs_app_gb28181" "srs_app_gb28181_sip")
fi
if [[ $SRS_GB28181 == YES || $SRS_RTC == YES ]]; then
MODULE_FILES+=("srs_app_rtc_jitbuffer")
MODULE_FILES+=("srs_app_gb28181" "srs_app_gb28181_sip" "srs_app_gb28181_jitter")
fi
if [[ $SRS_GB28181 == YES ]]; then
MODULE_FILES+=("srs_app_sip")
MODULE_FILES+=("srs_app_gb28181_stack")
ModuleLibIncs+=(${LibIconvRoot})
fi