胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
2656c97c 2 parents 310032d8 727652c5

merge srs2. release r2.0b4

内嵌 并排对比
正在显示 1 个修改的文件 包含 5 行增加 和 2 行删除
@@ -123,6 +123,7 @@ Please select your language: @@ -123,6 +123,7 @@ Please select your language:
123 * [SRS 2.0 English][v2_EN_Home] 123 * [SRS 2.0 English][v2_EN_Home]
124 * [SRS 2.0 Chinese][v2_CN_Home] 124 * [SRS 2.0 Chinese][v2_CN_Home]
125 125
  126 +<<<<<<< HEAD
126 ### SRS 3.0 wiki 127 ### SRS 3.0 wiki
127 128
128 Please select your language: 129 Please select your language:
@@ -205,6 +206,7 @@ Please select your language: @@ -205,6 +206,7 @@ Please select your language:
205 206
206 ### V2 changes 207 ### V2 changes
207 208
  209 +* <strong>v2.0, 2017-01-18, [2.0 beta4(2.0.230)][r2.0b4] released. 86334 lines.</strong>
208 * v2.0, 2017-01-18, fix [#749][bug #749], timestamp overflow for ATC. 2.0.230 210 * v2.0, 2017-01-18, fix [#749][bug #749], timestamp overflow for ATC. 2.0.230
209 * v2.0, 2017-01-11, fix [#740][bug #740], convert ts aac audio private stream 1 to common. 2.0.229 211 * v2.0, 2017-01-11, fix [#740][bug #740], convert ts aac audio private stream 1 to common. 2.0.229
210 * v2.0, 2017-01-11, fix [#588][bug #588], kbps interface error. 2.0.228 212 * v2.0, 2017-01-11, fix [#588][bug #588], kbps interface error. 2.0.228
@@ -1373,6 +1375,7 @@ Winlin @@ -1373,6 +1375,7 @@ Winlin
1373 1375
1374 [exo #828]: https://github.com/google/ExoPlayer/pull/828 1376 [exo #828]: https://github.com/google/ExoPlayer/pull/828
1375 1377
  1378 +[r2.0b4]: https://github.com/ossrs/srs/releases/tag/v2.0-b4
1376 [r2.0b3]: https://github.com/ossrs/srs/releases/tag/v2.0-b3 1379 [r2.0b3]: https://github.com/ossrs/srs/releases/tag/v2.0-b3
1377 [r2.0b2]: https://github.com/ossrs/srs/releases/tag/v2.0-b2 1380 [r2.0b2]: https://github.com/ossrs/srs/releases/tag/v2.0-b2
1378 [r2.0b1]: https://github.com/ossrs/srs/releases/tag/v2.0-b1 1381 [r2.0b1]: https://github.com/ossrs/srs/releases/tag/v2.0-b1
@@ -1415,6 +1418,6 @@ Winlin @@ -1415,6 +1418,6 @@ Winlin
1415 [branch2]: https://github.com/ossrs/srs/tree/2.0release 1418 [branch2]: https://github.com/ossrs/srs/tree/2.0release
1416 [release2]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release20 1419 [release2]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release20
1417 [release3]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release30 1420 [release3]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release30
1418 -[centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.223.zip  
1419 -[centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.223.zip 1421 +[centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.230.zip
  1422 +[centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.230.zip
1420 1423