胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
95979674 2 parents a865eb9c 2c21f74e

merge srs 2

内嵌 并排对比
正在显示 1 个修改的文件 包含 1 行增加 和 1 行删除
@@ -347,7 +347,7 @@ Remark: @@ -347,7 +347,7 @@ Remark:
347 * v3.0, 2015-08-31, fix [#319][bug #319], http raw api support query global and vhost. 3.0.3 347 * v3.0, 2015-08-31, fix [#319][bug #319], http raw api support query global and vhost. 3.0.3
348 * v3.0, 2015-08-28, fix [#471][bug #471], api response the width and height. 3.0.2 348 * v3.0, 2015-08-28, fix [#471][bug #471], api response the width and height. 3.0.2
349 * v3.0, 2015-08-25, fix [#367][bug #367], support nginx-rtmp exec. 3.0.1 349 * v3.0, 2015-08-25, fix [#367][bug #367], support nginx-rtmp exec. 3.0.1
350 -* <strong>v2.0, 2015-08-23, [2.0 alpha(2.0.185)][r2.0a0] released. 89022 lines.</strong> 350 +* <strong>v2.0, 2015-08-23, [2.0 alpha0(2.0.185)][r2.0a0] released. 89022 lines.</strong>
351 * v2.0, 2015-08-22, HTTP API support JSONP by specifies the query string callback=xxx. 351 * v2.0, 2015-08-22, HTTP API support JSONP by specifies the query string callback=xxx.
352 * v2.0, 2015-08-20, fix [#380][bug #380], srs-librtmp send sequence header when sps or pps changed. 352 * v2.0, 2015-08-20, fix [#380][bug #380], srs-librtmp send sequence header when sps or pps changed.
353 * v2.0, 2015-08-18, close [#454][bug #454], support obs restart publish. 2.0.184 353 * v2.0, 2015-08-18, close [#454][bug #454], support obs restart publish. 2.0.184