Merge branch '1.0release' into develop

@@ -21,3 +21,4 @@ CONTRIBUTORS ordered by first contribution.
 * StevenLiu<lq@chinaffmpeg.org> "Build SRS on Darwin OSX"
 * zhengfl<zhengfl_1989@126.com> "Bug fixed"
 * tufang14<breadbean1449@gmail.com> "Bug fixed"
+

@@ -18,3 +18,4 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+