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

merge from srs2.

This commit is contained in:
winlin 2015-11-02 13:43:22 +08:00
commit 2b21a63d8f

View file

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