胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
d67edf63 1 parent c85dde7f

update readme, add ubuntu12 to test list

内嵌 并排对比
正在显示 2 个修改的文件 包含 2 行增加 和 2 行删除
@@ -50,7 +50,7 @@ git clone https://github.com/winlinvip/simple-rtmp-server && @@ -50,7 +50,7 @@ git clone https://github.com/winlinvip/simple-rtmp-server &&
50 cd simple-rtmp-server/trunk 50 cd simple-rtmp-server/trunk
51 </pre> 51 </pre>
52 <strong>Step 2:</strong> build SRS, 52 <strong>Step 2:</strong> build SRS,
53 -<strong>Requires Centos6.x 64bits, others see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/Build)</strong><br/> 53 +<strong>Requires Centos6.x/Ubuntu12 32/64bits, others see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/Build)</strong><br/>
54 <pre> 54 <pre>
55 ./configure --with-ssl --without-hls --without-ffmpeg --without-http && make 55 ./configure --with-ssl --without-hls --without-ffmpeg --without-http && make
56 </pre> 56 </pre>
@@ -128,7 +128,7 @@ echo -e " | ${SrsLibrtmpSummaryColor}simple handshake: publish/play stre @@ -128,7 +128,7 @@ echo -e " | ${SrsLibrtmpSummaryColor}simple handshake: publish/play stre
128 echo -e " | ${SrsLibrtmpSSLSummaryColor}complex handshake: it's not required for client, recommend disable it\${BLACK}" 128 echo -e " | ${SrsLibrtmpSSLSummaryColor}complex handshake: it's not required for client, recommend disable it\${BLACK}"
129 echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp, the srs-librtmp client sample\${BLACK}" 129 echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp, the srs-librtmp client sample\${BLACK}"
130 echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" 130 echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
131 -echo -e " |\${GREEN}server: ./objs/srs, the srs server\${BLACK}" 131 +echo -e " |\${GREEN}server: ./objs/srs -c conf/srs.conf, start the srs server\${BLACK}"
132 echo -e " | ${SrsHlsSummaryColor}hls @see: https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS\${BLACK}" 132 echo -e " | ${SrsHlsSummaryColor}hls @see: https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS\${BLACK}"
133 echo -e " | ${SrsHlsSummaryColor}hls: generate m3u8 and ts, delivery HLS stream by nginx\${BLACK}" 133 echo -e " | ${SrsHlsSummaryColor}hls: generate m3u8 and ts, delivery HLS stream by nginx\${BLACK}"
134 echo -e " | ${SrsSslSummaryColor}ssl @see: https://github.com/winlinvip/simple-rtmp-server/wiki/RTMPHandshake\${BLACK}" 134 echo -e " | ${SrsSslSummaryColor}ssl @see: https://github.com/winlinvip/simple-rtmp-server/wiki/RTMPHandshake\${BLACK}"