external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-05-07 11:07:42 +08:00
commit 2d61a8cfaf
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
DONATIONS.txt
View file

@ -14,6 +14,7 @@ RMB 500-999
* [2015-04-11 12:48] 丁一 * [2015-04-11 12:48] 丁一
RMB 100-499 RMB 100-499
* [2015-05-06 22:04] 姜庆东
* [2015-04-10 19:52] 阳成飞 * [2015-04-10 19:52] 阳成飞
* [2015-03-30 13:34] 扶凯 * [2015-03-30 13:34] 扶凯
* [2015-03-29 11-07] 姚伟斌 * [2015-03-29 11-07] 姚伟斌

13
trunk/conf/push.flv.conf
View file

@ -4,6 +4,11 @@
listen 1935; listen 1935;
max_connections 1000; max_connections 1000;
http_server {
enabled on;
listen 8080;
dir ./objs/nginx/html;
}
stream_caster { stream_caster {
enabled on; enabled on;
caster flv; caster flv;
@ -11,4 +16,12 @@ stream_caster {
listen 8936; listen 8936;
} }
vhost __defaultVhost__ { vhost __defaultVhost__ {
hls {
enabled on;
hls_fragment 10;
hls_window 60;
hls_path ./objs/nginx/html;
hls_m3u8_file [app]/[stream].m3u8;
hls_ts_file [app]/[stream]-[seq].ts;
}
} }