胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
4342d3ed 2 parents 17df6172 5cd5ee73

Merge branch '2.0release' into develop

内嵌 并排对比
正在显示 1 个修改的文件 包含 51 行增加 和 51 行删除
@@ -358,33 +358,33 @@ Remark: @@ -358,33 +358,33 @@ 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/>  
362 -* 2015-12-23, [Release v2.0a3][r2.0a3], 2.0 alpha3, 2.0.205, 89544 lines.<br/>  
363 -* 2015-10-08, [Release v2.0a2][r2.0a2], 2.0 alpha2, 2.0.195, 89358 lines.<br/>  
364 -* 2015-09-14, [Release v2.0a1][r2.0a1], 2.0 alpha1, 2.0.189, 89269 lines.<br/>  
365 -* 2015-08-23, [Release v2.0a0][r2.0a0], 2.0 alpha0, 2.0.185, 89022 lines.<br/>  
366 -* 2015-05-23, [Release v1.0r4][r1.0r4], bug fixed, 1.0.32, 59509 lines.<br/>  
367 -* 2015-03-19, [Release v1.0r3][r1.0r3], bug fixed, 1.0.30, 59511 lines.<br/>  
368 -* 2015-02-12, [Release v1.0r2][r1.0r2], bug fixed, 1.0.27, 59507 lines.<br/>  
369 -* 2015-01-15, [Release v1.0r1][r1.0r1], bug fixed, 1.0.21, 59472 lines.<br/>  
370 -* 2014-12-05, [Release v1.0r0][r1.0r0], all bug fixed, 1.0.10, 59391 lines.<br/>  
371 -* 2014-10-09, [Release v1.0-beta][r1.0b0], all bug fixed, 1.0.0, 59316 lines.<br/>  
372 -* 2014-08-03, [Release v1.0-mainline7][r1.0a7], config utest, all bug fixed. 57432 lines.<br/>  
373 -* 2014-07-13, [Release v1.0-mainline6][r1.0a6], core/kernel/rtmp utest, refine bandwidth(as/js/srslibrtmp library). 50029 lines.<br/>  
374 -* 2014-06-27, [Release v1.0-mainline5][r1.0a5], refine perf 3k+ clients, edge token traverse, [srs monitor](http://ossrs.net:1977), 30days online. 41573 lines.<br/>  
375 -* 2014-05-28, [Release v1.0-mainline4][r1.0a4], support heartbeat, tracable log, fix mem leak and bugs. 39200 lines.<br/>  
376 -* 2014-05-18, [Release v1.0-mainline3][r1.0a3], support mips, fms origin, json(http-api). 37594 lines.<br/>  
377 -* 2014-04-28, [Release v1.0-mainline2][r1.0a2], support [dvr][v1_CN_DVR], android, [edge][v1_CN_Edge]. 35255 lines.<br/>  
378 -* 2014-04-07, [Release v1.0-mainline][r1.0a0], support [arm][v1_CN_SrsLinuxArm], [init.d][v1_CN_LinuxService], http [server][v1_CN_HTTPServer]/[api][v1_CN_HTTPApi], [ingest][v1_CN_SampleIngest]. 30000 lines.<br/>  
379 -* 2013-12-25, [Release v0.9][r0.9], support bandwidth test, player/encoder/chat [demos][v1_CN_SampleDemo]. 20926 lines.<br/>  
380 -* 2013-12-08, [Release v0.8][r0.8], support [http hooks callback][v1_CN_HTTPCallback], update [SB][srs-bench]. 19186 lines.<br/>  
381 -* 2013-12-03, [Release v0.7][r0.7], support [live stream transcoding][v1_CN_FFMPEG]. 17605 lines.<br/>  
382 -* 2013-11-29, [Release v0.6][r0.6], support [forward][v1_CN_Forward] stream to origin/edge. 16094 lines.<br/>  
383 -* 2013-11-26, [Release v0.5][r0.5], support [HLS(m3u8)][v1_CN_DeliveryHLS], fragment and window. 14449 lines.<br/>  
384 -* 2013-11-10, [Release v0.4][r0.4], support [reload][v1_CN_Reload] config, pause, longtime publish/play. 12500 lines.<br/>  
385 -* 2013-11-04, [Release v0.3][r0.3], support [vhost][v1_CN_RtmpUrlVhost], refer, gop cache, listen multiple ports. 11773 lines.<br/>  
386 -* 2013-10-25, [Release v0.2][r0.2], support [rtmp][v1_CN_RTMPHandshake] flash publish, h264, time jitter correct. 10125 lines.<br/>  
387 -* 2013-10-23, [Release v0.1][r0.1], support [rtmp FMLE/FFMPEG publish][v1_CN_DeliveryRTMP], vp6. 8287 lines.<br/> 361 +* 2015-12-23, [Release v2.0-b0][r2.0b0], 2.0 beta0, 2.0.210, 89704 lines.<br/>
  362 +* 2015-12-23, [Release v2.0-a3][r2.0a3], 2.0 alpha3, 2.0.205, 89544 lines.<br/>
  363 +* 2015-10-08, [Release v2.0-a2][r2.0a2], 2.0 alpha2, 2.0.195, 89358 lines.<br/>
  364 +* 2015-09-14, [Release v2.0-a1][r2.0a1], 2.0 alpha1, 2.0.189, 89269 lines.<br/>
  365 +* 2015-08-23, [Release v2.0-a0][r2.0a0], 2.0 alpha0, 2.0.185, 89022 lines.<br/>
  366 +* 2015-05-23, [Release v1.0-r4][r1.0r4], bug fixed, 1.0.32, 59509 lines.<br/>
  367 +* 2015-03-19, [Release v1.0-r3][r1.0r3], bug fixed, 1.0.30, 59511 lines.<br/>
  368 +* 2015-02-12, [Release v1.0-r2][r1.0r2], bug fixed, 1.0.27, 59507 lines.<br/>
  369 +* 2015-01-15, [Release v1.0-r1][r1.0r1], bug fixed, 1.0.21, 59472 lines.<br/>
  370 +* 2014-12-05, [Release v1.0-r0][r1.0r0], all bug fixed, 1.0.10, 59391 lines.<br/>
  371 +* 2014-10-09, [Release v0.9.8][r1.0b0], all bug fixed, 1.0.0, 59316 lines.<br/>
  372 +* 2014-08-03, [Release v0.9.7][r1.0a7], config utest, all bug fixed. 57432 lines.<br/>
  373 +* 2014-07-13, [Release v0.9.6][r1.0a6], core/kernel/rtmp utest, refine bandwidth(as/js/srslibrtmp library). 50029 lines.<br/>
  374 +* 2014-06-27, [Release v0.9.5][r1.0a5], refine perf 3k+ clients, edge token traverse, [srs monitor](http://ossrs.net:1977), 30days online. 41573 lines.<br/>
  375 +* 2014-05-28, [Release v0.9.4][r1.0a4], support heartbeat, tracable log, fix mem leak and bugs. 39200 lines.<br/>
  376 +* 2014-05-18, [Release v0.9.3][r1.0a3], support mips, fms origin, json(http-api). 37594 lines.<br/>
  377 +* 2014-04-28, [Release v0.9.2][r1.0a2], support [dvr][v1_CN_DVR], android, [edge][v1_CN_Edge]. 35255 lines.<br/>
  378 +* 2014-04-07, [Release v0.9.1][r1.0a0], support [arm][v1_CN_SrsLinuxArm], [init.d][v1_CN_LinuxService], http [server][v1_CN_HTTPServer]/[api][v1_CN_HTTPApi], [ingest][v1_CN_SampleIngest]. 30000 lines.<br/>
  379 +* 2013-12-25, [Release v0.9.0][r0.9], support bandwidth test, player/encoder/chat [demos][v1_CN_SampleDemo]. 20926 lines.<br/>
  380 +* 2013-12-08, [Release v0.8.0][r0.8], support [http hooks callback][v1_CN_HTTPCallback], update [SB][srs-bench]. 19186 lines.<br/>
  381 +* 2013-12-03, [Release v0.7.0][r0.7], support [live stream transcoding][v1_CN_FFMPEG]. 17605 lines.<br/>
  382 +* 2013-11-29, [Release v0.6.0][r0.6], support [forward][v1_CN_Forward] stream to origin/edge. 16094 lines.<br/>
  383 +* 2013-11-26, [Release v0.5.0][r0.5], support [HLS(m3u8)][v1_CN_DeliveryHLS], fragment and window. 14449 lines.<br/>
  384 +* 2013-11-10, [Release v0.4.0][r0.4], support [reload][v1_CN_Reload] config, pause, longtime publish/play. 12500 lines.<br/>
  385 +* 2013-11-04, [Release v0.3.0][r0.3], support [vhost][v1_CN_RtmpUrlVhost], refer, gop cache, listen multiple ports. 11773 lines.<br/>
  386 +* 2013-10-25, [Release v0.2.0][r0.2], support [rtmp][v1_CN_RTMPHandshake] flash publish, h264, time jitter correct. 10125 lines.<br/>
  387 +* 2013-10-23, [Release v0.1.0][r0.1], support [rtmp FMLE/FFMPEG publish][v1_CN_DeliveryRTMP], vp6. 8287 lines.<br/>
388 * 2013-10-17, Created.<br/> 388 * 2013-10-17, Created.<br/>
389 389
390 ### History 390 ### History
@@ -1306,30 +1306,30 @@ Winlin @@ -1306,30 +1306,30 @@ Winlin
1306 [r2.0b0]: https://github.com/ossrs/srs/releases/tag/v2.0-b0 1306 [r2.0b0]: https://github.com/ossrs/srs/releases/tag/v2.0-b0
1307 [r2.0a3]: https://github.com/ossrs/srs/releases/tag/v2.0-a3 1307 [r2.0a3]: https://github.com/ossrs/srs/releases/tag/v2.0-a3
1308 [r2.0a2]: https://github.com/ossrs/srs/releases/tag/v2.0-a2 1308 [r2.0a2]: https://github.com/ossrs/srs/releases/tag/v2.0-a2
1309 -[r2.0a1]: https://github.com/ossrs/srs/releases/tag/2.0a1  
1310 -[r2.0a0]: https://github.com/ossrs/srs/releases/tag/2.0a0  
1311 -[r1.0r4]: https://github.com/ossrs/srs/releases/tag/1.0r4  
1312 -[r1.0r3]: https://github.com/ossrs/srs/releases/tag/1.0r3  
1313 -[r1.0r2]: https://github.com/ossrs/srs/releases/tag/1.0r2  
1314 -[r1.0r1]: https://github.com/ossrs/srs/releases/tag/1.0r1  
1315 -[r1.0r0]: https://github.com/ossrs/srs/releases/tag/1.0r0  
1316 -[r1.0b0]: https://github.com/ossrs/srs/releases/tag/1.0.beta  
1317 -[r1.0a7]: https://github.com/ossrs/srs/releases/tag/1.0.mainline7  
1318 -[r1.0a6]: https://github.com/ossrs/srs/releases/tag/1.0.mainline6  
1319 -[r1.0a5]: https://github.com/ossrs/srs/releases/tag/1.0.mainline5  
1320 -[r1.0a4]: https://github.com/ossrs/srs/releases/tag/1.0.mainline4  
1321 -[r1.0a3]: https://github.com/ossrs/srs/releases/tag/1.0.mainline3  
1322 -[r1.0a2]: https://github.com/ossrs/srs/releases/tag/1.0.mainline2  
1323 -[r1.0a0]: https://github.com/ossrs/srs/releases/tag/1.0.mainline  
1324 -[r0.9]: https://github.com/ossrs/srs/releases/tag/0.9  
1325 -[r0.8]: https://github.com/ossrs/srs/releases/tag/0.8  
1326 -[r0.7]: https://github.com/ossrs/srs/releases/tag/0.7  
1327 -[r0.6]: https://github.com/ossrs/srs/releases/tag/0.6  
1328 -[r0.5]: https://github.com/ossrs/srs/releases/tag/0.5  
1329 -[r0.4]: https://github.com/ossrs/srs/releases/tag/0.4  
1330 -[r0.3]: https://github.com/ossrs/srs/releases/tag/0.3  
1331 -[r0.2]: https://github.com/ossrs/srs/releases/tag/0.2  
1332 -[r0.1]: https://github.com/ossrs/srs/releases/tag/0.1 1309 +[r2.0a1]: https://github.com/ossrs/srs/releases/tag/v2.0-a1
  1310 +[r2.0a0]: https://github.com/ossrs/srs/releases/tag/v2.0-a0
  1311 +[r1.0r4]: https://github.com/ossrs/srs/releases/tag/v1.0-r4
  1312 +[r1.0r3]: https://github.com/ossrs/srs/releases/tag/v1.0-r3
  1313 +[r1.0r2]: https://github.com/ossrs/srs/releases/tag/v1.0-r2
  1314 +[r1.0r1]: https://github.com/ossrs/srs/releases/tag/v1.0-r1
  1315 +[r1.0r0]: https://github.com/ossrs/srs/releases/tag/v1.0-r0
  1316 +[r1.0b0]: https://github.com/ossrs/srs/releases/tag/v0.9.8
  1317 +[r1.0a7]: https://github.com/ossrs/srs/releases/tag/v0.9.7
  1318 +[r1.0a6]: https://github.com/ossrs/srs/releases/tag/v0.9.6
  1319 +[r1.0a5]: https://github.com/ossrs/srs/releases/tag/v0.9.5
  1320 +[r1.0a4]: https://github.com/ossrs/srs/releases/tag/v0.9.4
  1321 +[r1.0a3]: https://github.com/ossrs/srs/releases/tag/v0.9.3
  1322 +[r1.0a2]: https://github.com/ossrs/srs/releases/tag/v0.9.2
  1323 +[r1.0a0]: https://github.com/ossrs/srs/releases/tag/v0.9.1
  1324 +[r0.9]: https://github.com/ossrs/srs/releases/tag/v0.9.0
  1325 +[r0.8]: https://github.com/ossrs/srs/releases/tag/v0.8.0
  1326 +[r0.7]: https://github.com/ossrs/srs/releases/tag/v0.7.0
  1327 +[r0.6]: https://github.com/ossrs/srs/releases/tag/v0.6.0
  1328 +[r0.5]: https://github.com/ossrs/srs/releases/tag/v0.5.0
  1329 +[r0.4]: https://github.com/ossrs/srs/releases/tag/v0.4.0
  1330 +[r0.3]: https://github.com/ossrs/srs/releases/tag/v0.3.0
  1331 +[r0.2]: https://github.com/ossrs/srs/releases/tag/v0.2.0
  1332 +[r0.1]: https://github.com/ossrs/srs/releases/tag/v0.1.0
1333 1333
1334 1334
1335 [contact]: https://github.com/ossrs/srs/wiki/v1_CN_Contact 1335 [contact]: https://github.com/ossrs/srs/wiki/v1_CN_Contact