Commit Graph

2050 Commits (a28c051c2c5cae14fe0156f52ee14b921cca8096)

Author SHA1 Message Date
winlin a28c051c2c osx support build nginx and ffmpeg 10 years ago
winlin f3e5431d0f check what a fuck os for some fresh. 10 years ago
winlin 8a4312f4ec fix bug, use size_t for string::npos 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 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
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
wenjie.zhao efe3050d7a fix hls muxer Segmentation fault. 10 years ago
wenjie.zhao 73f13dfc42 fix hls muxer Segmentation fault. 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 67671e43f9 Merge branch '2.0release' into develop 10 years ago
winlin 8ee0826e9a fix build failed bug. 10 years ago
winlin 0017ee85e0 Merge branch '2.0release' into develop 10 years ago
winlin 59d9af8039 update conf 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 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 74fa3ba16f fix build failed for linux. 10 years ago
winlin a15ce1147f for #155, fix all warnings for mac. 10 years ago
wenjie.zhao 643f18abe4 add hds reload supported.#328 10 years ago
winlin 984145de72 for #328, add todo for hds, check whether disabled, support reload. 10 years ago
winlin 5d12a1ab20 for #328, add hds specification. 10 years ago
winlin ffef62900f for #328, support adobe hds. 2.0.138. 10 years ago
winlin da56e4fbb9 for #328, fix hds compile error on mac. 10 years ago
wenjie.zhao 07d8f060eb refine annotation 10 years ago
wenjie.zhao 570c0d66bd fix path issue. 10 years ago
wenjie.zhao e57bda8908 Merge code.
Conflicts:
	trunk/configure
	trunk/src/app/srs_app_source.cpp
	trunk/src/kernel/srs_kernel_error.hpp
10 years ago
winlin a739b2c555 fix the bug for fork ffmpeg in mac, the local variable is unvailable. 10 years ago
winlin 3e5821efff enable http api for x86_x64 10 years ago
winlin 3732554844 remove the xcode state. 10 years ago
winlin 1ad0c847ce fix http parse bug 10 years ago
winlin f247ac9daf fix the http parse bug. 10 years ago
wenjie.zhao d4198ee8ba add hds supported. 10 years ago
winlin 5370493140 add ingest to mac.dev conf. 10 years ago
winlin 24616e15b5 remove the code for xcode, not required. 10 years ago
winlin b3aed2cb59 fix the bug of configure. 10 years ago