R3944Realms/srs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build script bug, create nginx/html/live dir

Browse Source
This commit is contained in:
winlin 2013-12-18 15:22:14 +08:00
parent 609a8fa472
commit 6beff7cf54
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
trunk/auto/depends.sh
View File

@ -331,8 +331,10 @@ fi
##################################################################################### #####################################################################################
# build research code # build research code
##################################################################################### #####################################################################################
(cd research/hls && make) mkdir -p ${SRS_OBJS}/research
(cd research/hls && make && mv ts_info ../../${SRS_OBJS}/research)
ret=$?; if [[ $ret -ne 0 ]]; then echo "build research/hls failed, ret=$ret"; exit $ret; fi ret=$?; if [[ $ret -ne 0 ]]; then echo "build research/hls failed, ret=$ret"; exit $ret; fi
(cd research/ffempty && make) (cd research/ffempty && make && mv ffempty ../../${SRS_OBJS}/research)
ret=$?; if [[ $ret -ne 0 ]]; then echo "build research/ffempty failed, ret=$ret"; exit $ret; fi ret=$?; if [[ $ret -ne 0 ]]; then echo "build research/ffempty failed, ret=$ret"; exit $ret; fi

2
trunk/conf/srs.conf
View File

@ -571,7 +571,7 @@ vhost all.transcode.vhost.com {
vhost ffempty.transcode.vhost.com { vhost ffempty.transcode.vhost.com {
transcode { transcode {
enabled on; enabled on;
ffmpeg ./research/ffempty/ffempty; ffmpeg ./objs/research/ffempty;
engine empty { engine empty {
enabled on; enabled on;
vcodec libx264; vcodec libx264;