diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 67840eeb2..01408120d 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -331,8 +331,10 @@ fi ##################################################################################### # 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 -(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 diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf index 9ee10aeed..2694e698d 100755 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -571,7 +571,7 @@ vhost all.transcode.vhost.com { vhost ffempty.transcode.vhost.com { transcode { enabled on; - ffmpeg ./research/ffempty/ffempty; + ffmpeg ./objs/research/ffempty; engine empty { enabled on; vcodec libx264;