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

regression test ok

Browse source
This commit is contained in:
winlin 2013-12-08 13:17:39 +08:00
parent 3fd3ac5a11
commit c618229487
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
trunk/conf/srs.conf
View file

@ -81,12 +81,11 @@ vhost __defaultVhost__ {
vhost dev { vhost dev {
enabled on; enabled on;
gop_cache on; gop_cache on;
hls off; hls on;
hls_path ./objs/nginx/html; hls_path ./objs/nginx/html;
hls_fragment 5; hls_fragment 5;
hls_window 30; hls_window 30;
#forward 127.0.0.1:19350; forward 127.0.0.1:19350;
#forward 127.0.0.1:1936;
http_hooks { http_hooks {
enabled on; enabled on;
on_connect http://127.0.0.1:8085/api/v1/clients; on_connect http://127.0.0.1:8085/api/v1/clients;
@ -97,10 +96,10 @@ vhost dev {
on_stop http://127.0.0.1:8085/api/v1/sessions; on_stop http://127.0.0.1:8085/api/v1/sessions;
} }
transcode { transcode {
enabled off; enabled on;
ffmpeg ./objs/ffmpeg/bin/ffmpeg; ffmpeg ./objs/ffmpeg/bin/ffmpeg;
engine dev { engine dev {
enabled off; enabled on;
vfilter { vfilter {
} }
vcodec libx264; vcodec libx264;