胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
8600c0eb 2 parents e5eb8538 2036cef4

Merge branch 'master' of github.com:winlinvip/simple-rtmp-server

内嵌 并排对比
正在显示 1 个修改的文件 包含 1 行增加 和 0 行删除
@@ -366,6 +366,7 @@ ln -sf `pwd`/${SRS_OBJS}/nginx/html/live research/api-server/static-dir/live && @@ -366,6 +366,7 @@ ln -sf `pwd`/${SRS_OBJS}/nginx/html/live research/api-server/static-dir/live &&
366 rm -rf research/api-server/static-dir/forward && 366 rm -rf research/api-server/static-dir/forward &&
367 mkdir -p `pwd`/${SRS_OBJS}/nginx/html/forward && 367 mkdir -p `pwd`/${SRS_OBJS}/nginx/html/forward &&
368 ln -sf `pwd`/${SRS_OBJS}/nginx/html/forward research/api-server/static-dir/forward 368 ln -sf `pwd`/${SRS_OBJS}/nginx/html/forward research/api-server/static-dir/forward
  369 +ret=$?; if [[ $ret -ne 0 ]]; then echo "link players to cherrypy static-dir failed, ret=$ret"; exit $ret; fi
369 370
370 # only when the nginx is ok, 371 # only when the nginx is ok,
371 # if api-server not enalbed, use nginx as demo. 372 # if api-server not enalbed, use nginx as demo.