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

merge from 2.0

This commit is contained in:
winlin 2015-09-14 18:42:31 +08:00
commit a7c4b786cf
15 changed files with 240 additions and 123 deletions

View file

@ -1045,6 +1045,7 @@ Winlin
[bug #367]: https://github.com/simple-rtmp-server/srs/issues/367
[bug #471]: https://github.com/simple-rtmp-server/srs/issues/471
[bug #380]: https://github.com/simple-rtmp-server/srs/issues/380
[bug #474]: https://github.com/simple-rtmp-server/srs/issues/474
[bug #475]: https://github.com/simple-rtmp-server/srs/issues/475
[bug #458]: https://github.com/simple-rtmp-server/srs/issues/458
[bug #454]: https://github.com/simple-rtmp-server/srs/issues/454