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 from 2.0

Browse source
This commit is contained in:
winlin 2015-09-14 18:42:31 +08:00
commit a7c4b786cf
15 changed files with 240 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

13
trunk/conf/full.conf
View file

@ -498,6 +498,14 @@ vhost min.delay.com {
}
}
# whether disable the sps parse, for the resolution of video.
vhost no.parse.sps.com {
# @see publish.srs.com
publish {
parse_sps on;
}
}
# the vhost to control the stream delivery feature
vhost stream.control.com {
# @see scope.vhost.srs.com
@ -546,6 +554,11 @@ vhost publish.srs.com {
# the normal packet timeout in ms for encoder.
# default: 5000
normal_timeout 7000;
# whether parse the sps when publish stream.
# we can got the resolution of video for stat api.
# but we may failed to cause publish failed.
# default: on
parse_sps on;
}
}