merge from srs.winlin

pull/549/head
winlin 10 years ago
commit b88d5640a4

@ -1,6 +1,6 @@
The MIT License (MIT)
Copyright (c) 2013-2014 winlin
Copyright (c) 2013-2015 SRS(simple-rtmp-server)
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in

Loading…
Cancel
Save