胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
7df7156e 2 parents 31a1b7be dbc6d940

Merge branch '2.0release' into develop

内嵌 并排对比
正在显示 1 个修改的文件 包含 2 行增加 和 0 行删除
@@ -403,6 +403,8 @@ Remark: @@ -403,6 +403,8 @@ Remark:
403 ======= 403 =======
404 ## History 404 ## History
405 405
  406 +* v2.0, 2016-08-10, fix socket timeout for librtmp.
  407 +* v2.0, 2016-08-08, fix the crash by srs_info log.
406 * <strong>v2.0, 2016-08-06, [2.0 beta0(2.0.210)][r2.0b0] released. 89704 lines.</strong> 408 * <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. 409 * 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 410 * v2.0, 2016-01-13, fix http reader bug, support infinite chunkted. 2.0.209