Commit Graph

4752 Commits (bd3d9f32b739b079c5e8b37ac5b105708c3b1944)
 

Author SHA1 Message Date
YueHonghui eb4ca9ff5d fix bug of fd leek in srs_app_server 9 years ago
winlin 51ed4b1e82 update donation 9 years ago
winlin 7ea0394b67 update donations 9 years ago
winlin c77cefb6fa refine the position of log script 9 years ago
winlin 44b26271bf Merge branch '2.0release' into develop 9 years ago
winlin c4c63f7825 fix build failed bug for osx. 9 years ago
winlin 01c46bdbfd rename org simle-rtmp-server to ossrs 9 years ago
winlin 1ffd5fd455 rename org simple-rtmp-server to ossrs 9 years ago
winlin 6c7a51d310 Merge branch '2.0release' into develop 9 years ago
winlin 1d8318d2fc change simple-rtmp-server org to ossrs 9 years ago
winlin d2ccc4f661 Merge branch '2.0release' into develop 9 years ago
winlin 1c944ed451 Merge pull request #522 from ossrs/hotfix/commit
use /usr/local/bin for osx.
9 years ago
winlin 8c04b17d08 use /usr/local/bin for osx. 9 years ago
winlin 7db7d43aea Merge branch '2.0release' into develop 9 years ago
winlin 18b50d961f support query server by id. 9 years ago
winlin aca9fe805c Merge branch '2.0release' into develop 9 years ago
winlin d916c53702 refine the api server. 9 years ago
winlin a3a6282fe9 merge srs2. 9 years ago
winlin a89ed68aa3 update readme for #511. 9 years ago
winlin 75be18133d fix build failed for utest. 9 years ago
winlin 6df4d1f05a merge from srs2. 9 years ago
winlin 98e25def6c fix utest build failed for osx. 9 years ago
winlin 97f5bb8b99 merge from srs2 9 years ago
zhengfl 38b81ce312 允许操作SrsStream中的函数时,长度为0. 9 years ago
zhengfl 1dae8fc987 fix #511, fix the bug of thread stop invalid. 9 years ago
winlin 6e3eb50b78 Merge branch '2.0release' into develop 9 years ago
winlin 6d0adb9f22 fix typo 9 years ago
winlin 302be41d00 merge from srs2.0.198 9 years ago
winlin 57536bf428 fix typo in readme. 9 years ago
winlin 2b21a63d8f merge from srs2. 9 years ago
winlin 49d77b3f09 for #515, use srs_freepa and SrsAutoFreeA for array. 2.0.198 9 years ago
winlin 4b5eb5ea2d fix the parse rtmp url bug for ingest. 9 years ago
winlin e3407c1dd2 merge from srs2. 9 years ago
winlin ec225b2108 quit child process when fork failed. 9 years ago
winlin 9d7826c681 quit child process when fork failed. 9 years ago
winlin f57e537686 for #515, merge from srs2, use SrsAutoFreeA. 9 years ago
winlin f4f76cd196 for #515, use SrsAutoFreeA to free the array. 9 years ago
winlin 604486b0a3 for #515, use srs_freepa to free array. 9 years ago
winlin 8cec06e898 merge srs2, use srs_freepa for array 9 years ago
winlin 2af7749771 for #515, use srs_freepa to free the array. 9 years ago
winlin cef1ae5a8e fix the config bug. 10 years ago
winlin 9ebb77d711 fix the warnings 10 years ago
winlin e9e202dbf1 merge srs2 10 years ago
winlin ef00005ab4 for ExoPlayer, remove duration for live. 10 years ago
winlin 8c96472cea merge srs2 10 years ago
winlin 50a7b9c1ff for ExoPlayer, add av tag in flv header. 2.0.197 10 years ago
winlin 59f5c5d6a5 Merge branch '2.0release' into develop 10 years ago
winlin 3b0bf1e10b for #512, make the segment more acceptable, when in [min, max_td * 2], it's ok. 10 years ago
winlin 390f58e186 fix compile failed. 10 years ago
winlin a416e891b4 fix compile failed. 10 years ago