1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-24 06:54:22 +00:00

Merge branch 'develop' into min

This commit is contained in:
winlin 2020-02-16 22:36:03 +08:00
commit 23ff925d25

View file

@ -204,6 +204,10 @@ Remark:
END END
} }
function ignore_option() {
echo "ignore option \"$option\""
}
function parse_user_option() { function parse_user_option() {
case "$option" in case "$option" in
-h) help=yes ;; -h) help=yes ;;
@ -293,18 +297,16 @@ function parse_user_option() {
--with-hls) SRS_HLS=YES ;; --with-hls) SRS_HLS=YES ;;
--with-dvr) SRS_DVR=YES ;; --with-dvr) SRS_DVR=YES ;;
--without-stream-caster) ;& --without-stream-caster) ignore_option ;;
--without-ingest) ;& --without-ingest) ignore_option ;;
--without-ssl) ;& --without-ssl) ignore_option ;;
--without-stat) ;& --without-stat) ignore_option ;;
--without-transcode) ;& --without-transcode) ignore_option ;;
--without-http-callback) ;& --without-http-callback) ignore_option ;;
--without-http-server) ;& --without-http-server) ignore_option ;;
--without-http-api) ;& --without-http-api) ignore_option ;;
--without-hls) ;& --without-hls) ignore_option ;;
--without-dvr) --without-dvr) ignore_option ;;
echo "ignore option \"$option\""
;;
*) *)
echo "$0: error: invalid option \"$option\"" echo "$0: error: invalid option \"$option\""