Commit Graph

3092 Commits (5d75e32e1df0176527471586ccd24a0bc966b014)
 

Author SHA1 Message Date
winlin 5d75e32e1d Merge branch '2.0release' into develop 10 years ago
winlin a1dd734318 fix #421, drop video for unkown RTMP header. 10 years ago
winlin 679b4317d8 fix the build failed bug. 10 years ago
winlin 0fbfad4172 fix gop cache, drop video only when video and not h.264 10 years ago
winlin 2a1db36750 refine the pithy print of ingesters. 10 years ago
winlin d10d57716a Merge branch '2.0release' into develop 10 years ago
winlin e4c27a51b8 fix the hls bug 10 years ago
winlin 4400b12515 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 10 years ago
winlin 26b76c0e4c fix #420, remove ts for hls ram mode. 10 years ago
winlin 5dd81d182c Merge branch '2.0release' into develop 10 years ago
winlin af9efe9213 disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls. 10 years ago
winlin 982a937e84 Merge branch '2.0release' into develop 10 years ago
winlin 4e42b9c628 copy the request for hls. 10 years ago
winlin 091b480ac9 Merge branch '2.0release' into develop 10 years ago
winlin 679583dad6 refine comments of ffmpeg. 10 years ago
winlin c1172c9940 Merge branch '2.0release' into develop 10 years ago
winlin 03d951c0fb fix the audio or video pid generate bug. 10 years ago
winlin c3c4cb2f2a Merge branch '2.0release' into develop 10 years ago
winlin 96f8f1f502 fix build bug. 10 years ago
winlin 09750082e5 Merge branch '2.0release' into develop 10 years ago
winlin 0a87b567f6 fix the build failed bug. 10 years ago
winlin 9dce971d57 merge from srs2 10 years ago
winlin 223ae194b1 fix #209, cleanup hls when stop and timeout. 2.0.173. 10 years ago
winlin 4a80a5a71e for #209, support cleanup when srs stop. 10 years ago
winlin 860d68e6e7 for #374, use fast stop for ingesters to stop many FFMPEG. 10 years ago
winlin d611bb6b45 for #209, server cycle to enable the hls to cleanup. do dispose 10 years ago
winlin 567d84e997 fix #374: when terminate srs, cleanup to ensure FFMPEG quit. 10 years ago
winlin db57a519a9 for #374, use SIGINT then SIGKILL to try to kill FFMPEG gracefullly. 10 years ago
winlin 597993d414 support pure video hls. 10 years ago
winlin 5caafadd45 fix #409: support pure video hls. 2.0.172. 10 years ago
winlin 3ad030fe83 add HLS overload 10 years ago
winlin 27a1fee6b9 Merge branch '2.0release' into develop 10 years ago
winlin af4eec90ac for srs-dolphin, support HTTP and RTMP. 10 years ago
winlin 41ead65345 support [srs-dolphin][srs-dolphin], the multiple-process SRS. 10 years ago
winlin b44987fac7 Merge branch '2.0release' into develop 10 years ago
winlin 394e070b2e support dolphin 10 years ago
winlin e5461d2df9 refine code 10 years ago
winlin 60775485c4 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 10 years ago
winlin 385ee893f5 update readme 10 years ago
zhengfl 4864e796d6 fix #408:Queue丢视频时,不应该丢弃SequenceHeader 10 years ago
winlin 7e04975b8d fix the test configure script 10 years ago
winlin 1150cde829 fix the verbose build failed. 10 years ago
winlin ca01bd407b fix the bug of test configure script. 10 years ago
winlin fec8422d6b fix bug of configure. 10 years ago
winlin eb488e3bde fix the test configure script bug 10 years ago
winlin 02c4741d64 add usage and make jobs support for configure test script 10 years ago
winlin c1b9541b5c support disable all 10 years ago
winlin 9ab579c6e8 refine the configure test script. 10 years ago
winlin 7349fed8b1 Merge branch '2.0release' into develop 10 years ago
winlin 8afeb29d8d update readme 10 years ago