external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Code Issues Releases Wiki Activity
2756 commits 13 branches 107 tags 375 MiB
Commit graph

2756 commits

This branch
This branch
All branches
Author SHA1 Message Date
wenjie.zhao
efe3050d7a fix hls muxer Segmentation fault. 2015-03-12 23:50:21 +08:00
wenjie.zhao
73f13dfc42 fix hls muxer Segmentation fault. 2015-03-12 23:39:44 +08:00
winlin
9a0a8affc5 Merge pull request #337 from tufang14/develop 
可能数组越界
 2015-03-16 16:02:06 +08:00
winlin
685a29af83 Merge branch '2.0release' into develop 2015-03-16 15:45:01 +08:00
winlin
c92d40e00b for #334, refine code, use kbps instead skt of rtmp connection. 2015-03-16 15:40:43 +08:00
Nimrod A. Abing (on kohima)
a95bd7d30e Modified on_close webhook. 
Pass the send_bytes and recv_bytes count to the web hook.
 2015-03-16 15:39:49 +08:00
Nimrod A. Abing (on kohima)
bc93147426 for #308, disable st examples. for #334, refine the st init and event select. 2015-03-16 15:35:01 +08:00
tufang14
6cf5a6a7a9 可能数组越界 
可能数组越界
 2015-03-16 15:08:17 +08:00
winlin
d8f52918aa add rudeb0t<nimrod@themanxgroup.tw> to authors. 2015-03-16 13:40:10 +08:00
Nimrod A. Abing (on eniwetok)
cea2e6316d Added .AppleDouble folders to ignore patterns. 2015-03-16 13:35:29 +08:00
winlin
67671e43f9 Merge branch '2.0release' into develop 2015-03-16 10:24:25 +08:00
winlin
8ee0826e9a fix build failed bug. 2015-03-16 10:24:19 +08:00
winlin
19ec1dafb7 Merge branch '2.0release' into develop 2015-03-15 21:56:39 +08:00
winlin
c32d9ee43e remove the contact from index. 2015-03-15 21:56:30 +08:00
winlin
0017ee85e0 Merge branch '2.0release' into develop 2015-03-15 19:34:11 +08:00
winlin
59d9af8039 update conf 2015-03-15 19:34:04 +08:00
winlin
ef39a88f3d Merge branch '2.0release' into develop 2015-03-15 14:18:12 +08:00
winlin
5d7c24de48 update readme 2015-03-15 14:18:05 +08:00
winlin
a21243ea12 merge from 2.0 2015-03-15 08:16:37 +08:00
winlin
d349a3dbda update stable version check 2015-03-15 08:15:04 +08:00
winlin
519c25a064 fork srs2 and start srs3. 3.0.0 2015-03-15 08:06:41 +08:00
winlin
636bc574af start 2.0release, 80773 lines. 2015-03-15 07:48:27 +08:00
winlin
5e19f5f2b8 add qq and weixin image. 2015-03-14 22:14:04 +08:00
winlin
e6058c1560 update donation 2015-03-14 20:25:21 +08:00
winlin
320f45c6f4 fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140. 2015-03-14 20:07:56 +08:00
winlin
27cb62b7aa for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139. 2015-03-14 19:45:13 +08:00
winlin
995b130090 for #324, refine code for hstrs, support hijack handler. 2015-03-14 14:55:45 +08:00
winlin
5c6ef6ded6 fix warning for xcode. 2015-03-14 13:09:34 +08:00
winlin
6d15d0ea99 for #324, refine code, add hstrs config. 2015-03-14 09:52:47 +08:00
winlin
2adc069df0 update readme for why srs 2015-03-13 18:07:43 +08:00
winlin
74fa3ba16f fix build failed for linux. 2015-03-13 17:34:33 +08:00
winlin
a15ce1147f for #155, fix all warnings for mac. 2015-03-13 12:53:01 +08:00
winlin
51967afb52 Merge pull request #330 from wenjiegit/develop 
HDS support reload，for #328
 2015-03-13 07:46:12 +08:00
wenjie.zhao
643f18abe4 add hds reload supported.#328 2015-03-12 22:38:11 +08:00
wenjie.zhao
abe0713980 Merge pull request #2 from winlinvip/develop 
Develop
 2015-03-12 15:11:32 +08:00
winlin
984145de72 for #328, add todo for hds, check whether disabled, support reload. 2015-03-12 11:52:35 +08:00
winlin
5d12a1ab20 for #328, add hds specification. 2015-03-12 11:36:12 +08:00
winlin
ffef62900f for #328, support adobe hds. 2.0.138. 2015-03-12 11:15:15 +08:00
winlin
da56e4fbb9 for #328, fix hds compile error on mac. 2015-03-12 07:26:30 +08:00
winlin
03bcfd9960 Merge pull request #327 from wenjiegit/develop 
for #328, add hds supported.
 2015-03-12 07:12:17 +08:00
winlin
a739b2c555 fix the bug for fork ffmpeg in mac, the local variable is unvailable. 2015-03-11 15:54:31 +08:00
winlin
3e5821efff enable http api for x86_x64 2015-03-11 15:04:34 +08:00
winlin
3732554844 remove the xcode state. 2015-03-11 14:56:03 +08:00
winlin
1ad0c847ce fix http parse bug 2015-03-11 14:55:46 +08:00
winlin
f247ac9daf fix the http parse bug. 2015-03-11 14:48:51 +08:00
wenjie.zhao
07d8f060eb refine annotation 2015-03-11 14:36:28 +08:00
wenjie.zhao
570c0d66bd fix path issue. 2015-03-11 14:34:00 +08:00
wenjie.zhao
066158de61 Merge branch 'winlinvip-develop' into develop 2015-03-11 14:19:35 +08:00
wenjie.zhao
e57bda8908 Merge code. 
Conflicts:
	trunk/configure
	trunk/src/app/srs_app_source.cpp
	trunk/src/kernel/srs_kernel_error.hpp
 2015-03-11 14:18:09 +08:00
wenjie.zhao
d4198ee8ba add hds supported. 2015-03-11 13:34:58 +08:00