1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-14 20:31:56 +00:00

Squash: Merge SRS 4.0

This commit is contained in:
winlin 2021-09-25 10:09:25 +08:00
parent 34cd7b2586
commit 149ad80b5d
2 changed files with 30 additions and 0 deletions

28
trunk/conf/live.conf Normal file
View file

@ -0,0 +1,28 @@
# Live streaming config for SRS.
# @see full.conf for detail config.
listen 1935;
max_connections 1000;
srs_log_tank console;
daemon off;
http_api {
enabled on;
listen 1985;
}
http_server {
enabled on;
listen 8080;
dir ./objs/nginx/html;
}
vhost __defaultVhost__ {
hls {
enabled on;
}
http_remux {
enabled on;
mount [vhost]/[app]/[stream].flv;
}
}

View file

@ -1,3 +1,5 @@
# WebRTC streaming config for SRS.
# @see full.conf for detail config.
listen 1935;
max_connections 1000;