胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
abeb4f46 2 parents 499fc07d 007f7da5

merge 2.0

内嵌 并排对比
正在显示 2 个修改的文件 包含 21 行增加 和 1 行删除
@@ -358,6 +358,7 @@ Remark: @@ -358,6 +358,7 @@ Remark:
358 358
359 ### Releases 359 ### Releases
360 360
  361 +* 2015-12-23, [Release v2.0b0][r2.0b0], 2.0 beta0, 2.0.210, 89704 lines.<br/>
361 * 2015-12-23, [Release v2.0a3][r2.0a3], 2.0 alpha3, 2.0.205, 89544 lines.<br/> 362 * 2015-12-23, [Release v2.0a3][r2.0a3], 2.0 alpha3, 2.0.205, 89544 lines.<br/>
362 * 2015-10-08, [Release v2.0a2][r2.0a2], 2.0 alpha2, 2.0.195, 89358 lines.<br/> 363 * 2015-10-08, [Release v2.0a2][r2.0a2], 2.0 alpha2, 2.0.195, 89358 lines.<br/>
363 * 2015-09-14, [Release v2.0a1][r2.0a1], 2.0 alpha1, 2.0.189, 89269 lines.<br/> 364 * 2015-09-14, [Release v2.0a1][r2.0a1], 2.0 alpha1, 2.0.189, 89269 lines.<br/>
@@ -386,6 +387,7 @@ Remark: @@ -386,6 +387,7 @@ Remark:
386 * 2013-10-23, [Release v0.1][r0.1], support [rtmp FMLE/FFMPEG publish][v1_CN_DeliveryRTMP], vp6. 8287 lines.<br/> 387 * 2013-10-23, [Release v0.1][r0.1], support [rtmp FMLE/FFMPEG publish][v1_CN_DeliveryRTMP], vp6. 8287 lines.<br/>
387 * 2013-10-17, Created.<br/> 388 * 2013-10-17, Created.<br/>
388 389
  390 +<<<<<<< HEAD
389 ### History 391 ### History
390 392
391 * v3.0, 2015-10-23, fix [#467][bug #467], support write log to kafka. 3.0.6 393 * v3.0, 2015-10-23, fix [#467][bug #467], support write log to kafka. 3.0.6
@@ -398,6 +400,16 @@ Remark: @@ -398,6 +400,16 @@ Remark:
398 * v3.0, 2015-08-31, fix [#319][bug #319], http raw api support query global and vhost. 400 * v3.0, 2015-08-31, fix [#319][bug #319], http raw api support query global and vhost.
399 * v3.0, 2015-08-28, fix [#471][bug #471], api response the width and height. 3.0.2 401 * v3.0, 2015-08-28, fix [#471][bug #471], api response the width and height. 3.0.2
400 * v3.0, 2015-08-25, fix [#367][bug #367], support nginx-rtmp exec. 3.0.1 402 * v3.0, 2015-08-25, fix [#367][bug #367], support nginx-rtmp exec. 3.0.1
  403 +=======
  404 +## History
  405 +
  406 +* <strong>v2.0, 2016-08-06, [2.0 beta0(2.0.210)][r2.0b0] released. 89704 lines.</strong>
  407 +* v2.0, 2016-05-17, fix the sps pps parse bug.
  408 +* v2.0, 2016-01-13, fix http reader bug, support infinite chunkted. 2.0.209
  409 +* v2.0, 2016-01-09, merge [#559][pr #559] fix memory leak bug. 2.0.208
  410 +* v2.0, 2016-01-09, merge [#558][pr #558] add tcUrl for on_publish.
  411 +* v2.0, 2016-01-05, add keyword XCORE for coredump to identify the version. 2.0.207
  412 +>>>>>>> 2.0release
401 * <strong>v2.0, 2015-12-23, [2.0 alpha3(2.0.205)][r2.0a3] released. 89544 lines.</strong> 413 * <strong>v2.0, 2015-12-23, [2.0 alpha3(2.0.205)][r2.0a3] released. 89544 lines.</strong>
402 * <strong>v2.0, 2015-10-08, [2.0 alpha2(2.0.195)][r2.0a2] released. 89358 lines.</strong> 414 * <strong>v2.0, 2015-10-08, [2.0 alpha2(2.0.195)][r2.0a2] released. 89358 lines.</strong>
403 * <strong>v2.0, 2015-09-14, [2.0 alpha1(2.0.189)][r2.0a1] released. 89269 lines.</strong> 415 * <strong>v2.0, 2015-09-14, [2.0 alpha1(2.0.189)][r2.0a1] released. 89269 lines.</strong>
@@ -1300,6 +1312,7 @@ Winlin @@ -1300,6 +1312,7 @@ Winlin
1300 1312
1301 [exo #828]: https://github.com/google/ExoPlayer/pull/828 1313 [exo #828]: https://github.com/google/ExoPlayer/pull/828
1302 1314
  1315 +[r2.0b0]: https://github.com/ossrs/srs/releases/tag/v2.0-b0
1303 [r2.0a3]: https://github.com/ossrs/srs/releases/tag/v2.0-a3 1316 [r2.0a3]: https://github.com/ossrs/srs/releases/tag/v2.0-a3
1304 [r2.0a2]: https://github.com/ossrs/srs/releases/tag/v2.0-a2 1317 [r2.0a2]: https://github.com/ossrs/srs/releases/tag/v2.0-a2
1305 [r2.0a1]: https://github.com/ossrs/srs/releases/tag/2.0a1 1318 [r2.0a1]: https://github.com/ossrs/srs/releases/tag/2.0a1
@@ -1336,8 +1349,15 @@ Winlin @@ -1336,8 +1349,15 @@ Winlin
1336 [branch2]: https://github.com/ossrs/srs/tree/2.0release 1349 [branch2]: https://github.com/ossrs/srs/tree/2.0release
1337 [release2]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release20 1350 [release2]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release20
1338 [release3]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release30 1351 [release3]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release30
  1352 +<<<<<<< HEAD
1339 [centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.205.zip 1353 [centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.205.zip
1340 [centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.205.zip 1354 [centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.205.zip
1341 [srs_CN]: https://github.com/ossrs/srs/wiki/v3_CN_Home 1355 [srs_CN]: https://github.com/ossrs/srs/wiki/v3_CN_Home
1342 [srs_EN]: https://github.com/ossrs/srs/wiki/v3_EN_Home 1356 [srs_EN]: https://github.com/ossrs/srs/wiki/v3_EN_Home
  1357 +=======
  1358 +[centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.210.zip
  1359 +[centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.210.zip
  1360 +[srs_CN]: https://github.com/ossrs/srs/wiki/v2_CN_Home
  1361 +[srs_EN]: https://github.com/ossrs/srs/wiki/v2_EN_Home
  1362 +>>>>>>> 2.0release
1343 1363
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR 3 32 #define VERSION_MAJOR 3
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 6 34 +#define VERSION_REVISION 210
35 35
36 // generated by configure, only macros. 36 // generated by configure, only macros.
37 #include <srs_auto_headers.hpp> 37 #include <srs_auto_headers.hpp>