正在显示
2 个修改的文件
包含
7 行增加
和
3 行删除
| @@ -504,6 +504,8 @@ if [ $SRS_FFMPEG = YES ]; then | @@ -504,6 +504,8 @@ if [ $SRS_FFMPEG = YES ]; then | ||
| 504 | if [ ! -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]; then echo "build ffmpeg-2.1 failed."; exit -1; fi | 504 | if [ ! -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]; then echo "build ffmpeg-2.1 failed."; exit -1; fi |
| 505 | fi | 505 | fi |
| 506 | 506 | ||
| 507 | +# whatever the FFMPEG tools, if transcode and ingest specified, | ||
| 508 | +# srs always compile the FFMPEG tool stub which used to start the FFMPEG process. | ||
| 507 | __SRS_FFMPEG=NO | 509 | __SRS_FFMPEG=NO |
| 508 | if [ $SRS_TRANSCODE = YES ]; then __SRS_FFMPEG=YES; fi | 510 | if [ $SRS_TRANSCODE = YES ]; then __SRS_FFMPEG=YES; fi |
| 509 | if [ $SRS_INGEST = YES ]; then __SRS_FFMPEG=YES; fi | 511 | if [ $SRS_INGEST = YES ]; then __SRS_FFMPEG=YES; fi |
| @@ -199,6 +199,7 @@ if [ $SRS_DEV = YES ]; then | @@ -199,6 +199,7 @@ if [ $SRS_DEV = YES ]; then | ||
| 199 | SRS_FFMPEG=YES | 199 | SRS_FFMPEG=YES |
| 200 | SRS_TRANSCODE=YES | 200 | SRS_TRANSCODE=YES |
| 201 | SRS_INGEST=YES | 201 | SRS_INGEST=YES |
| 202 | + SRS_HTTP_PARSER=YES | ||
| 202 | SRS_HTTP_CALLBACK=YES | 203 | SRS_HTTP_CALLBACK=YES |
| 203 | SRS_HTTP_SERVER=YES | 204 | SRS_HTTP_SERVER=YES |
| 204 | SRS_HTTP_API=YES | 205 | SRS_HTTP_API=YES |
| @@ -222,9 +223,10 @@ if [ $SRS_PI = YES ]; then | @@ -222,9 +223,10 @@ if [ $SRS_PI = YES ]; then | ||
| 222 | SRS_NGINX=NO | 223 | SRS_NGINX=NO |
| 223 | SRS_SSL=YES | 224 | SRS_SSL=YES |
| 224 | if [ $SRS_FFMPEG = RESERVED ]; then SRS_FFMPEG=NO; fi | 225 | if [ $SRS_FFMPEG = RESERVED ]; then SRS_FFMPEG=NO; fi |
| 225 | - if [ $SRS_TRANSCODE = RESERVED ]; then SRS_TRANSCODE=NO; fi | ||
| 226 | - if [ $SRS_INGEST = RESERVED ]; then SRS_INGEST=NO; fi | ||
| 227 | - SRS_HTTP_CALLBACK=NO | 226 | + if [ $SRS_TRANSCODE = RESERVED ]; then SRS_TRANSCODE=YES; fi |
| 227 | + if [ $SRS_INGEST = RESERVED ]; then SRS_INGEST=YES; fi | ||
| 228 | + SRS_HTTP_PARSER=YES | ||
| 229 | + SRS_HTTP_CALLBACK=YES | ||
| 228 | SRS_HTTP_SERVER=YES | 230 | SRS_HTTP_SERVER=YES |
| 229 | SRS_HTTP_API=YES | 231 | SRS_HTTP_API=YES |
| 230 | SRS_LIBRTMP=NO | 232 | SRS_LIBRTMP=NO |
-
请 注册 或 登录 后发表评论