正在显示
2 个修改的文件
包含
5 行增加
和
3 行删除
@@ -331,8 +331,10 @@ fi | @@ -331,8 +331,10 @@ fi | ||
331 | ##################################################################################### | 331 | ##################################################################################### |
332 | # build research code | 332 | # build research code |
333 | ##################################################################################### | 333 | ##################################################################################### |
334 | -(cd research/hls && make) | 334 | +mkdir -p ${SRS_OBJS}/research |
335 | + | ||
336 | +(cd research/hls && make && mv ts_info ../../${SRS_OBJS}/research) | ||
335 | ret=$?; if [[ $ret -ne 0 ]]; then echo "build research/hls failed, ret=$ret"; exit $ret; fi | 337 | ret=$?; if [[ $ret -ne 0 ]]; then echo "build research/hls failed, ret=$ret"; exit $ret; fi |
336 | 338 | ||
337 | -(cd research/ffempty && make) | 339 | +(cd research/ffempty && make && mv ffempty ../../${SRS_OBJS}/research) |
338 | ret=$?; if [[ $ret -ne 0 ]]; then echo "build research/ffempty failed, ret=$ret"; exit $ret; fi | 340 | ret=$?; if [[ $ret -ne 0 ]]; then echo "build research/ffempty failed, ret=$ret"; exit $ret; fi |
@@ -571,7 +571,7 @@ vhost all.transcode.vhost.com { | @@ -571,7 +571,7 @@ vhost all.transcode.vhost.com { | ||
571 | vhost ffempty.transcode.vhost.com { | 571 | vhost ffempty.transcode.vhost.com { |
572 | transcode { | 572 | transcode { |
573 | enabled on; | 573 | enabled on; |
574 | - ffmpeg ./research/ffempty/ffempty; | 574 | + ffmpeg ./objs/research/ffempty; |
575 | engine empty { | 575 | engine empty { |
576 | enabled on; | 576 | enabled on; |
577 | vcodec libx264; | 577 | vcodec libx264; |
-
请 注册 或 登录 后发表评论