Commit Graph

2787 Commits (6191e0af90b07fad6bff9d8878e9b33df688e504)

Author SHA1 Message Date
winlin 6191e0af90 s1 compute key. 9 years ago
winlin 18eb8c81b3 merge from srs2 9 years ago
winlin 2310b2da59 fix #518, fix fd leak bug when fork. 2.0.200 9 years ago
YueHonghui eb4ca9ff5d fix bug of fd leek in srs_app_server 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 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 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 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 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. 9 years ago
winlin 9ebb77d711 fix the warnings 9 years ago
winlin e9e202dbf1 merge srs2 9 years ago
winlin ef00005ab4 for ExoPlayer, remove duration for live. 9 years ago
winlin 8c96472cea merge srs2 9 years ago
winlin 50a7b9c1ff for ExoPlayer, add av tag in flv header. 2.0.197 9 years ago
winlin 59f5c5d6a5 Merge branch '2.0release' into develop 9 years ago
winlin 3b0bf1e10b for #512, make the segment more acceptable, when in [min, max_td * 2], it's ok. 9 years ago
winlin 390f58e186 fix compile failed. 9 years ago
winlin a416e891b4 fix compile failed. 9 years ago
winlin 1d57e53910 merge from 2.0release 9 years ago
winlin d1979c760f for #512, partical hotfix the hls pure audio. 2.0.196 9 years ago
winlin 3683f06e4d for #512, write audio frame by frame for video+audio hls. 9 years ago
winlin fe27e76492 support schema 9 years ago
winlin a501f5bd7a update htbt script 9 years ago
winlin dd2945add1 update htbt script 9 years ago
winlin 6f6d495a19 update htbt script 9 years ago