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

simplify usage

Browse source
This commit is contained in:
winlin 2014-03-10 19:13:18 +08:00
parent 13d9b44c73
commit 2fa0d60186
4 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
trunk/auto/depends.sh
View file

@ -270,6 +270,9 @@ if [ $SRS_HLS = YES ]; then
ln -sf `pwd`/research/players ${SRS_OBJS}/nginx/html/players && ln -sf `pwd`/research/players ${SRS_OBJS}/nginx/html/players &&
rm -f ${SRS_OBJS}/nginx/crossdomain.xml && rm -f ${SRS_OBJS}/nginx/crossdomain.xml &&
ln -sf `pwd`/research/players/crossdomain.xml ${SRS_OBJS}/nginx/html/crossdomain.xml ln -sf `pwd`/research/players/crossdomain.xml ${SRS_OBJS}/nginx/html/crossdomain.xml
# nginx.html to detect whether nginx is alive
echo "nginx is ok" > ${SRS_OBJS}/nginx/html/nginx.html
fi fi
if [ $SRS_HLS = YES ]; then if [ $SRS_HLS = YES ]; then

9
trunk/conf/hls.conf Normal file
View file

@ -0,0 +1,9 @@
listen 1935;
vhost __defaultVhost__ {
hls {
enabled on;
hls_path ./objs/nginx/html;
hls_fragment 10;
hls_window 60;
}
}

0
trunk/conf/rtmp.conf Executable file → Normal file
View file

0
trunk/conf/srs.19350.conf Executable file → Normal file
View file