1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Commit graph

2239 commits

Author SHA1 Message Date
winlin
fa9f60eb3d Merge branch 'srs.master' 2014-11-15 16:53:45 +08:00
winlin
2c601a0069 fix #204, srs-librtmp drop dupliated sps/pps(sequence header). 2.0.22. 2014-11-15 16:53:24 +08:00
winlin
b4269c8d67 refine name of srslibrtmp, raw_stream to h264_raw_stream 2014-11-15 16:31:42 +08:00
winlin
5912c6252b Merge branch 'srs.master' 2014-11-15 16:30:57 +08:00
winlin
278ff845d3 fix #203, srs-librtmp drop any video before sps/pps(sequence header). 2.0.21. 2014-11-15 16:30:37 +08:00
winlin
ecfbcd68d8 refine srslibrtmp, rename flv_bool to srs_flv_bool 2014-11-15 16:07:33 +08:00
winlin
a99b79fd95 Merge branch 'srs.master' 2014-11-15 15:28:14 +08:00
winlin
3292136f70 update research, flv ingester, support atc time flv. 2014-11-15 15:27:19 +08:00
winlin
65dd0f1659 Merge branch 'srs.master' 2014-11-15 14:37:17 +08:00
winlin
30d48905b3 refine git sync script, checkout master 2014-11-15 14:34:23 +08:00
winlin
daed6fe193 Merge branch 'srs.master' 2014-11-15 14:29:42 +08:00
winlin
bb5e99f562 fix #202, fix memory leak of h.264 raw packet send in srs-librtmp. 2.0.20. 2014-11-15 14:29:25 +08:00
winlin
c67e8b6862 Merge branch 'srs.master' 2014-11-15 13:21:50 +08:00
winlin
7ebca6cb5b refine the type of RTMP from int to char. add srs_parse_timestamp(), 2.0.19 2014-11-15 13:20:58 +08:00
winlin
68b0c14592 Merge branch 'srs.master' 2014-11-14 17:34:21 +08:00
winlin
9b2da59eeb update readme 2014-11-14 17:33:34 +08:00
winlin
b90d32ee8b Merge branch 'srs.master' 2014-11-14 11:41:13 +08:00
winlin
55d4ce603e update readme 2014-11-14 11:40:55 +08:00
winlin
050e51ea9b Merge branch 'srs.master' 2014-11-14 11:25:42 +08:00
winlin
47ed9e33dd refine code for bug #194, use send messages for all msg array. 2014-11-14 11:24:49 +08:00
winlin
94df80dc39 Merge branch 'srs.master' 2014-11-13 17:31:51 +08:00
winlin
f11272e3ce add comments for bug #194, #196 2014-11-13 17:29:56 +08:00
winlin
bc597ddb58 Merge branch 'srs.master' 2014-11-13 17:04:51 +08:00
winlin
38a683192a fix typo 2014-11-13 17:04:13 +08:00
winlin
8a60b3f8f3 Merge branch 'srs.master' 2014-11-13 16:58:16 +08:00
winlin
f2f02b06d5 for bug #194, refine code, to 2.0.17 2014-11-13 16:56:59 +08:00
winlin
8845bb7caf for bug #194, refine code, remove the old duplicated code. 2014-11-13 16:56:41 +08:00
winlin
ebbb4f6be5 Merge branch 'srs.master' 2014-11-13 14:55:28 +08:00
winlin
1f5c82ecc4 update readme 2014-11-13 14:54:40 +08:00
winlin
2da1ba0a1f Merge branch 'srs.1.0release' into 1.0release 2014-11-13 14:49:20 +08:00
winlin
eba1740ed5 hotfix #200, deadloop when read/write 0 and ETIME. 1.0.6. 2014-11-13 14:48:21 +08:00
winlin
abd891fab3 Merge branch 'srs.master' 2014-11-13 14:39:14 +08:00
winlin
62719c2b12 for bug #200, fix the writev for librtmp, add comments. 2014-11-13 14:38:23 +08:00
winlin
e5c504b465 Merge branch 'srs.master' 2014-11-13 14:31:19 +08:00
winlin
0bc35e093c for bug #200, deadloop when read/write 0 and ETIME. 2.0.16. 2014-11-13 14:30:56 +08:00
winlin
93e5d87463 Merge branch 'srs.master' 2014-11-13 13:50:45 +08:00
winlin
77cf885d8c add comments for #161 2014-11-13 13:49:50 +08:00
winlin
3084ec49de Merge branch 'srs.master' 2014-11-13 12:46:44 +08:00
winlin
4af2e78c59 refine code for bug #194, add comments to macros. 2014-11-13 12:45:54 +08:00
winlin
7c2576e518 Merge branch 'srs.master' 2014-11-13 12:27:13 +08:00
winlin
cc6aca9ad5 fix #194, writev multiple msgs, support 6k+ 250kbps clients. 2.0.15. 2014-11-13 12:25:56 +08:00
winlin
bee313e924 Merge branch 'srs.master' 2014-11-12 18:42:11 +08:00
winlin
7cf855f242 for bug #199, refine the header generate 2014-11-12 18:41:24 +08:00
winlin
7f6583a097 Merge branch 'srs.master' 2014-11-12 18:19:47 +08:00
winlin
953159258c refine code, rename the c0c3 header cache and iov cache. 2014-11-12 18:19:09 +08:00
winlin
a1a6292a05 Merge branch 'srs.master' 2014-11-12 18:00:35 +08:00
winlin
ab93506b01 for bug #199, refine the api of send message. 2014-11-12 17:59:32 +08:00
winlin
cac2980654 Merge branch 'srs.master' 2014-11-12 13:48:03 +08:00
winlin
55580ca900 add comments about bug #197 2014-11-12 13:47:04 +08:00
winlin
d257360e96 add comments about bug #196 2014-11-12 13:46:21 +08:00