winlin

merge srs2.

正在显示 1 个修改的文件 包含 1 行增加0 行删除
@@ -1285,6 +1285,7 @@ Winlin @@ -1285,6 +1285,7 @@ Winlin
1285 [bug #467]: https://github.com/simple-rtmp-server/srs/issues/467 1285 [bug #467]: https://github.com/simple-rtmp-server/srs/issues/467
1286 [bug #512]: https://github.com/simple-rtmp-server/srs/issues/512 1286 [bug #512]: https://github.com/simple-rtmp-server/srs/issues/512
1287 [bug #515]: https://github.com/simple-rtmp-server/srs/issues/515 1287 [bug #515]: https://github.com/simple-rtmp-server/srs/issues/515
  1288 +[bug #511]: https://github.com/simple-rtmp-server/srs/issues/511
1288 [bug #xxxxxxxxxx]: https://github.com/simple-rtmp-server/srs/issues/xxxxxxxxxx 1289 [bug #xxxxxxxxxx]: https://github.com/simple-rtmp-server/srs/issues/xxxxxxxxxx
1289 1290
1290 [exo #828]: https://github.com/google/ExoPlayer/pull/828 1291 [exo #828]: https://github.com/google/ExoPlayer/pull/828