Merge branch '2.0release' into develop

This commit is contained in:
winlin 2015-05-25 09:59:57 +08:00
commit 7349fed8b1

View File

@ -265,7 +265,7 @@ Compare SRS with other media server.
| Security | Stable | Stable | X | X | Stable |
| Token Traverse| Stable | X | X | Stable | X |
### Performance
### Efficiency
| Feature | SRS | NGINX | CRTMPD | FMS | WOWZA |
| ----------- | ------- | ----- | --------- | -------- | ------ |