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 srs.conf

Browse source
This commit is contained in:
wenjiegit 2013-12-13 03:51:02 +08:00
parent c87e55a2cc
commit 94fb022ef9
1 changed files with 1 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
trunk/conf/srs.conf
View file

@ -1,14 +1,5 @@
# the listen ports, split by space.
listen 1935;
<<<<<<< HEAD
=======
# the default chunk size is 128, max is 65536,
# some client does not support chunk size change,
# however, most clients supports it and it can improve
# performance about 10%.
# default: 4096
chunk_size 65000;
>>>>>>> upstream/master
# the logs dir.
# if enabled ffmpeg, each stracoding stream will create a log file.
# default: ./objs/logs
@ -105,15 +96,12 @@ vhost dev {
gop_cache on;
queue_length 10;
forward 127.0.0.1:19350;
<<<<<<< HEAD
=======
hls {
enabled on;
hls_path ./objs/nginx/html;
hls_fragment 5;
hls_window 30;
}
>>>>>>> upstream/master
http_hooks {
enabled off;
on_connect http://127.0.0.1:8085/api/v1/clients;
@ -124,7 +112,7 @@ vhost dev {
on_stop http://127.0.0.1:8085/api/v1/sessions;
}
transcode {
enabled off;
enabled on;
ffmpeg ./objs/ffmpeg/bin/ffmpeg;
engine dev {
enabled on;