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 feature/rtc

Browse source
This commit is contained in:
winlin 2020-07-26 16:42:44 +08:00
commit 0f62587303
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/conf/rtc.conf
View file

@ -28,7 +28,6 @@ rtc_server {
# The * means retrieving server IP automatically, from all network interfaces, # The * means retrieving server IP automatically, from all network interfaces,
# @see https://github.com/ossrs/srs/issues/307#issuecomment-599028124 # @see https://github.com/ossrs/srs/issues/307#issuecomment-599028124
candidate $CANDIDATE; candidate $CANDIDATE;
#candidate 10.0.0.123;
} }
vhost __defaultVhost__ { vhost __defaultVhost__ {

4
trunk/research/players/js/winlin.utility.js
View file

@ -5,7 +5,7 @@
* depends: jquery1.10 * depends: jquery1.10
* https://gitee.com/winlinvip/codes/rpn0c2ewbomj81augzk4y59 * https://gitee.com/winlinvip/codes/rpn0c2ewbomj81augzk4y59
* @see: http://blog.csdn.net/win_lin/article/details/17994347 * @see: http://blog.csdn.net/win_lin/article/details/17994347
* v 1.0.20 * v 1.0.21
*/ */
/** /**
@ -339,7 +339,7 @@ function parse_rtmp_url(rtmp_url) {
} else if (schema === 'rtmp') { } else if (schema === 'rtmp') {
port = 1935; port = 1935;
} else if (schema === 'webrtc' || schema === 'rtc') { } else if (schema === 'webrtc' || schema === 'rtc') {
port = 1985; port = (window.location.href.indexOf('https://')==0)? 443:1985;
} }
} }