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-10-04 08:10:57 +08:00
commit ed80d9d281
2 changed files with 20 additions and 7 deletions

View file

@ -1102,6 +1102,7 @@ Winlin
[bug #485]: https://github.com/simple-rtmp-server/srs/issues/485
[bug #495]: https://github.com/simple-rtmp-server/srs/issues/495
[bug #497]: https://github.com/simple-rtmp-server/srs/issues/497
[bug #448]: https://github.com/simple-rtmp-server/srs/issues/448
[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