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 'develop' into merge/develop

Browse source
This commit is contained in:
winlin 2021-07-21 10:35:00 +08:00
commit 7f14085e6f
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/configure vendored
View file

@ -387,9 +387,6 @@ fi
if [[ $SRS_FFMPEG_FIT == YES ]]; then
ModuleLibFiles+=("${LibFfmpegFile[*]}")
fi
if [[ $SRS_GB28181 == YES ]]; then
ModuleLibFiles+=("${LibIconvfile[*]}")
fi
#
for SRS_MODULE in ${SRS_MODULES[*]}; do
. auto/reset_module.sh && . $SRS_MODULE/config
@ -428,9 +425,6 @@ if [ $SRS_UTEST = YES ]; then
if [[ $SRS_SRT == YES ]]; then
ModuleLibFiles+=("${LibSRTfile[*]}")
fi
if [[ $SRS_GB28181 == YES ]]; then
ModuleLibFiles+=("${LibIconvfile[*]}")
fi
MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP")
if [[ $SRS_SRT == YES ]]; then
MODULE_DEPENDS+=("SRT")

3
trunk/scripts/git.commit.sh
View file

@ -1,4 +1,5 @@
#!/bin/bash
for file in $(git remote); do echo ""; git push $file $@; done
#for file in $(git remote); do echo ""; git push $file $@; done
for file in $(git remote -v|grep -v https|grep push|awk '{print $1}'); do echo ""; git push $file $@; done