Commit Graph

2925 Commits (cfc0877ec9ff4fe7826a24a76f7a109fe1210f8f)
 

Author SHA1 Message Date
winlin 6855ab4c52 Merge branch 'develop' of https://github.com/tufang14/simple-rtmp-server into tufang14-develop 10 years ago
winlin 9bf6c9e9c6 Merge branch '2.0release' into develop 10 years ago
winlin cf3becbc17 for #155, osx(darwin) enable http api and stat, rusage is ok. 10 years ago
winlin 9f81a8b73e for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143. 10 years ago
winlin ab673e1300 for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143. 10 years ago
winlin a28c051c2c osx support build nginx and ffmpeg 10 years ago
winlin f3e5431d0f check what a fuck os for some fresh. 10 years ago
tufang14 1cc3384a19 seg fault
seg fault
10 years ago
winlin 79fbeeb8c6 Merge branch '2.0release' into develop 10 years ago
winlin 8a4312f4ec fix bug, use size_t for string::npos 10 years ago
winlin 9e407d32fe change verstion to 3.0.0 10 years ago
winlin 2241ba0e34 for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142 10 years ago
winlin 1a12ff0d94 Merge branch 'wenjiegit-develop' into 2.0release 10 years ago
winlin 9c43c73d86 Merge branch 'develop' of https://github.com/wenjiegit/simple-rtmp-server into wenjiegit-develop 10 years ago
winlin 33e579599c refine build for osx 10 years ago
winlin 806b45e844 Merge branch 'wenjiegit-develop' into 2.0release 10 years ago
winlin 9a0a8affc5 Merge pull request #337 from tufang14/develop
可能数组越界
10 years ago
winlin 685a29af83 Merge branch '2.0release' into develop 10 years ago
winlin c92d40e00b for #334, refine code, use kbps instead skt of rtmp connection. 10 years ago
Nimrod A. Abing (on kohima) a95bd7d30e Modified on_close webhook.
Pass the send_bytes and recv_bytes count to the web hook.
10 years ago
Nimrod A. Abing (on kohima) bc93147426 for #308, disable st examples. for #334, refine the st init and event select. 10 years ago
tufang14 6cf5a6a7a9 可能数组越界
可能数组越界
10 years ago
winlin d8f52918aa add rudeb0t<nimrod@themanxgroup.tw> to authors. 10 years ago
Nimrod A. Abing (on eniwetok) cea2e6316d Added .AppleDouble folders to ignore patterns. 10 years ago
winlin 67671e43f9 Merge branch '2.0release' into develop 10 years ago
winlin 8ee0826e9a fix build failed bug. 10 years ago
winlin 19ec1dafb7 Merge branch '2.0release' into develop 10 years ago
winlin c32d9ee43e remove the contact from index. 10 years ago
winlin 0017ee85e0 Merge branch '2.0release' into develop 10 years ago
winlin 59d9af8039 update conf 10 years ago
winlin ef39a88f3d Merge branch '2.0release' into develop 10 years ago
winlin 5d7c24de48 update readme 10 years ago
winlin a21243ea12 merge from 2.0 10 years ago
winlin d349a3dbda update stable version check 10 years ago
winlin 519c25a064 fork srs2 and start srs3. 3.0.0 10 years ago
winlin 636bc574af start 2.0release, 80773 lines. 10 years ago
winlin 5e19f5f2b8 add qq and weixin image. 10 years ago
winlin e6058c1560 update donation 10 years ago
winlin 320f45c6f4 fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140. 10 years ago
winlin 27cb62b7aa for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139. 10 years ago
winlin 995b130090 for #324, refine code for hstrs, support hijack handler. 10 years ago
winlin 5c6ef6ded6 fix warning for xcode. 10 years ago
winlin 6d15d0ea99 for #324, refine code, add hstrs config. 10 years ago
winlin 2adc069df0 update readme for why srs 10 years ago
winlin 74fa3ba16f fix build failed for linux. 10 years ago
winlin a15ce1147f for #155, fix all warnings for mac. 10 years ago
winlin 51967afb52 Merge pull request #330 from wenjiegit/develop
HDS support reload,for #328
10 years ago
wenjie.zhao 65f404fb42 for #340, refine ts prefix code. 10 years ago
wenjie.zhao 5969f72354 for #340, refine ts prefix code. 10 years ago
wenjie.zhao 10da182853 add hls prefix of uri supported 10 years ago