1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Commit graph

2042 commits

Author SHA1 Message Date
winlin
7f4916f86d Merge branch 'srs.master' 2014-11-07 21:07:23 +08:00
winlin
b964a6c534 update for bug #66, add the srs-librtmp sample for publish h.264 raw stream. 2014-11-07 21:06:44 +08:00
winlin
cf3c7f0e95 Merge branch 'srs.master' 2014-11-07 16:48:56 +08:00
winlin
1db69b153e update the research of arm 2014-11-07 16:47:49 +08:00
winlin
1e51462677 Merge branch 'srs.master' 2014-11-06 15:54:24 +08:00
winlin
0f41e0d26f research st: only support linux 2014-11-06 15:45:31 +08:00
winlin
d67454ecc2 research st: only support linux 2014-11-06 15:43:28 +08:00
winlin
76d5914d7c Merge branch 'srs.master' 2014-11-06 15:18:45 +08:00
winlin
5fd308c64e update code, warning when compile dev branch. 2014-11-06 15:18:10 +08:00
winlin
c99b5592cb Merge branch 'srs.master' 2014-11-06 14:28:31 +08:00
winlin
fa53250202 refine the macro, use int as version type. 2.0.8 2014-11-06 14:23:08 +08:00
winlin
9d6c22d45e Merge branch 'srs.master' 2014-11-06 14:01:28 +08:00
winlin
8521762cb3 research st: refine sync. 2014-11-06 14:00:27 +08:00
winlin
3377df0bea research st: refine skt. 2014-11-06 13:55:06 +08:00
winlin
85b987d1a2 Merge branch 'srs.master' 2014-11-06 13:54:03 +08:00
winlin
22710db911 research st: refine sched. 2014-11-06 13:52:15 +08:00
winlin
0a60a1af58 Merge branch 'srs.master' 2014-11-06 13:41:08 +08:00
winlin
f5f8e8946f research st: refine event, io and key. 2014-11-06 13:40:24 +08:00
winlin
28b67c10ab Merge branch 'srs.master' 2014-11-06 13:18:23 +08:00
winlin
c38a545780 reserach st: refine key.c 2014-11-06 13:17:54 +08:00
winlin
fd0c85b324 research st: refine io. 2014-11-06 13:11:34 +08:00
winlin
a5bc8f73d1 Merge branch 'srs.master' 2014-11-06 12:51:23 +08:00
winlin
f8f18fffa7 research st: update test for st. 2014-11-06 12:50:27 +08:00
winlin
eeec9c185f Merge branch 'srs.master' 2014-11-05 17:43:25 +08:00
winlin
0f293802c8 research st: refine the md.h 2014-11-05 17:42:57 +08:00
winlin
856ba07bd3 research st: update public and common. 2014-11-05 17:22:36 +08:00
winlin
ec7343ffab Merge branch 'srs.master' 2014-11-05 17:16:40 +08:00
winlin
315707d726 research st: refine public 2014-11-05 17:16:15 +08:00
winlin
7bfa86de5a Merge branch 'srs.master' 2014-11-05 17:13:18 +08:00
winlin
bba2d3dd98 research st: replace the TAB with 4spaces 2014-11-05 17:12:56 +08:00
winlin
760c37ae82 Merge branch 'srs.master' 2014-11-05 17:11:35 +08:00
winlin
55bd1dd95e research st: replace the TAB with 4spaces 2014-11-05 17:10:54 +08:00
winlin
0faa38dc0c research st: remove the osguess.sh 2014-11-05 17:06:18 +08:00
winlin
f3c7e354e7 Merge branch 'srs.master' 2014-11-05 17:02:27 +08:00
winlin
2dc6b7d1ea add io for st research 2014-11-05 17:01:15 +08:00
winlin
ccb4c0d03f Merge branch 'srs.master' 2014-10-27 12:57:04 +08:00
winlin
9d7e6b9bb2 update mirror utils 2014-10-27 12:56:04 +08:00
winlin
574f02fe72 Merge branch 'srs.master' 2014-10-27 12:55:02 +08:00
winlin
d88a2cc8dc update readme 2014-10-27 12:18:50 +08:00
winlin
60ab365660 update mirror, use utils functions. 2014-10-27 12:03:56 +08:00
winlin
e104a18763 update sync script on master 2014-10-27 11:40:59 +08:00
winlin
ff76afa81a update readme 2014-10-27 11:34:05 +08:00
winlin
b8db8b0fa4 add oschina mirror 2014-10-27 11:32:34 +08:00
winlin
610c36eaeb Merge branch 'srs.master' 2014-10-27 11:31:39 +08:00
winlin
c69d523b39 remove license 2014-10-27 11:20:48 +08:00
winlinvip
bbb1e0bbbd Initial commit 2014-10-27 11:12:48 +08:00
winlin
511c814ffb refs #182: rename to sync test. 2014-10-26 16:38:00 +08:00
winlin
69fdec411f refs #182: rename to sync test. 2014-10-26 16:35:12 +08:00
winlin
9aba47cbe3 refs #182: research st, add multiple threadds. 2014-10-26 14:04:31 +08:00
winlin
79ab9f05f3 refs #182: update the st, use cond and mutex. 2014-10-26 13:55:37 +08:00