1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00

merge srs2.

This commit is contained in:
winlin 2015-11-06 10:52:29 +08:00
commit a3a6282fe9

View file

@ -1285,6 +1285,7 @@ Winlin
[bug #467]: https://github.com/simple-rtmp-server/srs/issues/467 [bug #467]: https://github.com/simple-rtmp-server/srs/issues/467
[bug #512]: https://github.com/simple-rtmp-server/srs/issues/512 [bug #512]: https://github.com/simple-rtmp-server/srs/issues/512
[bug #515]: https://github.com/simple-rtmp-server/srs/issues/515 [bug #515]: https://github.com/simple-rtmp-server/srs/issues/515
[bug #511]: https://github.com/simple-rtmp-server/srs/issues/511
[bug #xxxxxxxxxx]: https://github.com/simple-rtmp-server/srs/issues/xxxxxxxxxx [bug #xxxxxxxxxx]: https://github.com/simple-rtmp-server/srs/issues/xxxxxxxxxx
[exo #828]: https://github.com/google/ExoPlayer/pull/828 [exo #828]: https://github.com/google/ExoPlayer/pull/828