胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
309abde7 2 parents 10a0c6c1 ba1c92a7

merge srs2

内嵌 并排对比
正在显示 1 个修改的文件 包含 14 行增加 和 8 行删除
@@ -204,18 +204,18 @@ Please select your language: @@ -204,18 +204,18 @@ Please select your language:
204 204
205 ### V2 changes 205 ### V2 changes
206 206
207 -* v2.0, 2017-01-06, for #730, reset ack follow flash player rules. 2.0.225  
208 -* v2.0, 2016-12-15, for #513, remove hls ram from srs2 to srs3+. 2.0.224 207 +* v2.0, 2017-01-06, for [#730][bug #730], reset ack follow flash player rules. 2.0.225
  208 +* v2.0, 2016-12-15, for [#513][bug #513], remove hls ram from srs2 to srs3+. 2.0.224
209 * <strong>v2.0, 2016-12-13, [2.0 beta3(2.0.223)][r2.0b3] released. 86685 lines.</strong> 209 * <strong>v2.0, 2016-12-13, [2.0 beta3(2.0.223)][r2.0b3] released. 86685 lines.</strong>
210 -* v2.0, 2016-12-13, fix #713, disable the source cleanup. 2.0.223  
211 -* v2.0, 2016-12-13, fix #713, refine source to avoid critical fetch and create. 2.0.222 210 +* v2.0, 2016-12-13, fix [#713][bug #713], disable the source cleanup. 2.0.223
  211 +* v2.0, 2016-12-13, fix [#713][bug #713], refine source to avoid critical fetch and create. 2.0.222
212 * <strong>v2.0, 2016-11-09, [2.0 beta2(2.0.221)][r2.0b2] released. 86691 lines.</strong> 212 * <strong>v2.0, 2016-11-09, [2.0 beta2(2.0.221)][r2.0b2] released. 86691 lines.</strong>
213 -* v2.0, 2016-11-05, fix #654, crash when source cleanup for edge. 2.0.221  
214 -* v2.0, 2016-10-26, fix #666, crash when source cleanup for http-flv. 2.0.220  
215 -* v2.0, 2016-10-10, fix #661, close fd after thread stopped. 2.0.219 213 +* v2.0, 2016-11-05, fix [#654][bug #654], crash when source cleanup for edge. 2.0.221
  214 +* v2.0, 2016-10-26, fix [#666][bug #666], crash when source cleanup for http-flv. 2.0.220
  215 +* v2.0, 2016-10-10, fix [#661][bug #661], close fd after thread stopped. 2.0.219
216 * v2.0, 2016-09-23, support asprocess for oryx. 2.0.218 216 * v2.0, 2016-09-23, support asprocess for oryx. 2.0.218
217 * v2.0, 2016-09-23, support change work_dir for oryx. 217 * v2.0, 2016-09-23, support change work_dir for oryx.
218 -* v2.0, 2016-09-15, fix #640, typo for rtmp type. 2.0.217 218 +* v2.0, 2016-09-15, fix [#640][bug #640], typo for rtmp type. 2.0.217
219 * v2.0, 2016-09-12, fix fast stream error bug. 2.0.216 219 * v2.0, 2016-09-12, fix fast stream error bug. 2.0.216
220 * <strong>v2.0, 2016-09-09, [2.0 beta1(2.0.215)][r2.0b1] released. 89941 lines.</strong> 220 * <strong>v2.0, 2016-09-09, [2.0 beta1(2.0.215)][r2.0b1] released. 89941 lines.</strong>
221 * v2.0, 2016-09-09, refine librtmp comments about NALUs. 2.0.215 221 * v2.0, 2016-09-09, refine librtmp comments about NALUs. 2.0.215
@@ -1356,6 +1356,12 @@ Winlin @@ -1356,6 +1356,12 @@ Winlin
1356 [bug #717]: https://github.com/ossrs/srs/issues/717 1356 [bug #717]: https://github.com/ossrs/srs/issues/717
1357 [bug #691]: https://github.com/ossrs/srs/issues/691 1357 [bug #691]: https://github.com/ossrs/srs/issues/691
1358 [bug #711]: https://github.com/ossrs/srs/issues/711 1358 [bug #711]: https://github.com/ossrs/srs/issues/711
  1359 +[bug #640]: https://github.com/ossrs/srs/issues/640
  1360 +[bug #661]: https://github.com/ossrs/srs/issues/661
  1361 +[bug #666]: https://github.com/ossrs/srs/issues/666
  1362 +[bug #654]: https://github.com/ossrs/srs/issues/654
  1363 +[bug #713]: https://github.com/ossrs/srs/issues/713
  1364 +[bug #513]: https://github.com/ossrs/srs/issues/513
1359 [bug #730]: https://github.com/ossrs/srs/issues/730 1365 [bug #730]: https://github.com/ossrs/srs/issues/730
1360 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx 1366 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
1361 1367