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
2287 commits 13 branches 107 tags 375 MiB
Commit graph

2287 commits

This branch
This branch
All branches
Author SHA1 Message Date
winlin
ad8b63d228 Merge branch 'srs.master' 2014-11-25 11:11:57 +08:00
winlin
d91a9dfa9d udpate the srs_bwt. 2014-11-25 11:10:54 +08:00
winlin
e11fa383ca udpate the srs_bwt. 2014-11-25 11:09:28 +08:00
winlin
499277a00e Merge branch 'srs.master' 2014-11-25 11:06:38 +08:00
winlin
02778dba4c udpate the srs_bwt. 2014-11-25 11:05:45 +08:00
winlin
cb0620318c Merge branch 'srs.master' 2014-11-25 11:01:48 +08:00
winlin
a2af051840 udpate the srs_bwt. 2014-11-25 10:59:38 +08:00
winlin
1c90b19035 Merge branch 'srs.1.0release' into 1.0release 2014-11-25 10:51:28 +08:00
winlin
cd0ab5fb43 update PRIMARY, AUTHORS, CONTRIBUTORS rule 2014-11-25 10:50:59 +08:00
winlin
db7af6259a update PRIMARY, AUTHORS, CONTRIBUTORS rule 2014-11-25 10:50:25 +08:00
winlin
5865b30b8d Merge branch 'srs.master' 2014-11-25 10:42:33 +08:00
winlin
e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32. 2014-11-25 10:41:55 +08:00
winlin
9426b834d1 Merge branch 'srs.1.0release' into 1.0release 2014-11-25 10:18:14 +08:00
winlin
5a4c5f0f59 Merge branch 'srs.master' 2014-11-25 10:18:06 +08:00
winlin
d672fae255 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 1.0.8 2014-11-25 10:07:41 +08:00
winlin
44962c9142 update PRIMARY, AUTHORS, CONTRIBUTORS rule 2014-11-25 10:06:26 +08:00
winlin
32cf44e5bb update PRIMARY, AUTHORS, CONTRIBUTORS rule 2014-11-25 10:01:14 +08:00
winlin
3c46bcbddc update PRIMARY, AUTHORS, CONTRIBUTORS rule 2014-11-25 09:58:11 +08:00
winlin
c0cb87ba04 Merge branch 'srs.master' 2014-11-25 09:51:43 +08:00
winlin
5fde890603 update PRIMARY, AUTHORS, CONTRIBUTORS rule 2014-11-25 09:50:57 +08:00
winlin
8059f6f342 Merge branch 'srs.master' 2014-11-24 16:29:47 +08:00
winlin
e492fa5353 fix #212, support publish aac adts raw stream. 2.0.31. 2014-11-24 16:28:52 +08:00
winlin
0c6282a048 Merge branch 'srs.master' 2014-11-22 19:16:52 +08:00
winlin
3d97048c3a fix bug #217, add reuse conn to play different player. 2014-11-22 19:15:40 +08:00
winlin
28ef4e122e Merge branch 'srs.master' 2014-11-22 18:09:03 +08:00
winlin
3e81e6e0f1 refine code for bug #217, use recv thread to set the timeout. 2014-11-22 18:08:45 +08:00
winlin
9ababa2a41 Merge branch 'srs.master' 2014-11-22 18:00:04 +08:00
winlin
5408169b6e update readme 2014-11-22 17:59:42 +08:00
winlin
0346355f5d Merge branch 'srs.master' 2014-11-22 17:58:31 +08:00
winlin
58136ec178 fix #217, remove timeout recv, support 7.5k+ 250kbps clients. 2.0.30. 2014-11-22 17:58:02 +08:00
winlin
72f66ee1a8 Merge branch 'srs.master' 2014-11-22 16:03:41 +08:00
winlin
622218c4dd for bug #217, use isolate thread to improve 17% performance. 2014-11-22 15:53:05 +08:00
winlin
7a4901cd54 Merge branch 'srs.master' 2014-11-21 17:10:37 +08:00
winlin
d3c770d252 refine librtmp, add audio video detail. 2014-11-21 17:09:52 +08:00
winlin
d80b580c2f refine librtmp, remove the _get_ for some attribute get. 2014-11-21 16:08:29 +08:00
winlin
5c8c40f4ee Merge branch 'srs.master' 2014-11-21 14:30:29 +08:00
winlin
bb7a19636a fix the bandwidth file name bug. 2014-11-21 14:30:01 +08:00
winlin
72aa6d3e11 Merge branch 'srs.master' 2014-11-21 14:27:57 +08:00
winlin
2a9bec3d89 adjust the api, move audio and h264 after rtmp 2014-11-21 14:26:47 +08:00
winlin
01f0513bd7 Merge branch 'srs.master' 2014-11-21 14:19:48 +08:00
winlin
aa69f6197a srs-librtmp add rtmp prefix for rtmp apis. 2.0.29 2014-11-21 14:18:50 +08:00
winlin
180106ce70 refine librtmp, move the utils and human to end section. 2014-11-21 14:11:53 +08:00
winlin
10bc5399ec refine librtmp api, add prefix utils for utilities. 2014-11-21 14:09:17 +08:00
winlin
b3bb2cdf2b refine code, rename the human functions to prefixed with srs_human_ 2014-11-21 14:03:30 +08:00
winlin
30e7c38a48 refine code, add human readable section 2014-11-21 13:56:09 +08:00
winlin
aab53e0606 Merge branch 'srs.master' 2014-11-21 13:49:32 +08:00
winlin
d9474d7600 refine examples of srs-librtmp, add srs_print_rtmp_packet. 2.0.28. 2014-11-21 13:48:57 +08:00
winlin
0ce0df3fb4 Merge branch 'srs.master' 2014-11-20 13:36:51 +08:00
winlin
a058eeeb20 fix #212, support publish audio raw frames. 2.0.27 2014-11-20 13:36:14 +08:00
winlin
743876eace Merge branch 'srs.master' 2014-11-20 10:45:46 +08:00