正在显示
3 个修改的文件
包含
4 行增加
和
3 行删除
| @@ -92,7 +92,7 @@ for android: http://demo:80/forward/live/livestream_sd.html | @@ -92,7 +92,7 @@ for android: http://demo:80/forward/live/livestream_sd.html | ||
| 92 | <pre> | 92 | <pre> |
| 93 | killall -1 srs | 93 | killall -1 srs |
| 94 | </pre> | 94 | </pre> |
| 95 | -or use specified signal name to reload:<br/> | 95 | +or use specified signal to reload:<br/> |
| 96 | <pre> | 96 | <pre> |
| 97 | killall -s SIGHUP srs | 97 | killall -s SIGHUP srs |
| 98 | </pre> | 98 | </pre> |
| @@ -86,7 +86,8 @@ else | @@ -86,7 +86,8 @@ else | ||
| 86 | --enable-postproc --enable-bzlib --enable-zlib --enable-parsers \ | 86 | --enable-postproc --enable-bzlib --enable-zlib --enable-parsers \ |
| 87 | --enable-libfreetype \ | 87 | --enable-libfreetype \ |
| 88 | --enable-libx264 --enable-libmp3lame --enable-libaacplus \ | 88 | --enable-libx264 --enable-libmp3lame --enable-libaacplus \ |
| 89 | - --enable-pthreads --extra-libs=-lpthread --enable-encoders --enable-decoders --enable-avfilter --enable-muxers --enable-demuxers && | 89 | + --enable-pthreads --extra-libs=-lpthread \ |
| 90 | + --enable-encoders --enable-decoders --enable-avfilter --enable-muxers --enable-demuxers && | ||
| 90 | make && make install | 91 | make && make install |
| 91 | - ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build x264 failed"; exit 1; fi | 92 | + ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build ffmpeg failed"; exit 1; fi |
| 92 | fi | 93 | fi |
trunk/auto/depends.sh
100755 → 100644
-
请 注册 或 登录 后发表评论