2138 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
winlin	856cc0a51d	update donations.	2014-11-20 10:45:03 +08:00
winlin	56f5e8a65b	Merge branch 'srs.master'	2014-11-19 16:16:56 +08:00
winlin	d6072b16c0	support compile srs-librtmp on windows. 2.0.26	2014-11-19 16:16:04 +08:00
winlin	77cdd77248	Merge branch 'srs.master'	2014-11-19 10:45:59 +08:00
winlin	5f48d4f566	refine comments for SrsMessageArray. 2.0.25	2014-11-19 10:44:50 +08:00
winlin	b00946aa14	Merge branch 'srs.master'	2014-11-18 17:56:02 +08:00
winlin	df35f75df1	refine response call, 2.0.24	2014-11-18 17:55:38 +08:00
winlin	9ba66f6ecd	Merge branch 'srs.master'	2014-11-18 17:53:21 +08:00
winlin	89110d9748	add report bug url. update readme	2014-11-18 17:52:41 +08:00
winlin	fafbe0cdf8	Merge branch 'srs.master'	2014-11-18 17:31:22 +08:00
winlin	749fac414b	refine code, donot response call when transaction id is zero.	2014-11-18 17:30:40 +08:00
winlin	3553a18c86	Merge branch 'srs.master'	2014-11-18 16:32:30 +08:00
winlin	1bf32a15e1	refs #1670: update readme, SRS1.0/2.0 supports 500 clients to publish streams.	2014-11-18 16:31:26 +08:00
winlin	a0ed9bcb24	Merge branch 'srs.master'	2014-11-18 13:43:35 +08:00
winlin	fbcb63f775	v2.0, 2014-11-18, all wiki translated to English. 2.0.23.	2014-11-18 13:40:58 +08:00
winlin	fd37d2396b	Merge branch 'srs.master'	2014-11-17 10:28:18 +08:00
winlin	9f60a6738a	add comments for listen	2014-11-17 10:27:05 +08:00
winlin	520764fba3	update readme, add qq group.	2014-11-16 21:11:49 +08:00
winlin	ba5b3b92b1	update readme, add qq group.	2014-11-16 21:08:06 +08:00
winlin	5557160ead	Merge branch 'srs.master'	2014-11-16 11:30:32 +08:00
winlin	0c39a704c2	update build srs librtmp single	2014-11-16 11:29:50 +08:00
winlin	f2cb46d2d6	Merge branch 'srs.master'	2014-11-15 21:30:37 +08:00