3484 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	edead21a25	refine the options	2015-09-22 12:51:29 +08:00
winlin	e415824576	refine the options	2015-09-22 12:43:22 +08:00
winlin	2d5cc7a3e4	add structures for kafka	2015-09-22 12:38:07 +08:00
winlin	83f40697e2	refine the hpp macro defines.	2015-09-22 09:15:51 +08:00
winlin	df6ac8842c	rename rtmp utility to protocol utility	2015-09-22 09:11:07 +08:00
winlin	82ff05c1d4	rename rtmp io to protocol io	2015-09-22 09:07:07 +08:00
winlin	168625dce2	rename rtmp amf0 to protocol amf0.	2015-09-22 09:05:21 +08:00
winlin	1310c0f577	rename srs_protocol_buffer to srs_protocol_stream	2015-09-22 09:02:37 +08:00
winlin	d32632ee8a	rename SrsFastBuffer to SrsFastStream	2015-09-22 09:01:47 +08:00
winlin	4f3d2c8607	rename SrsSimpleBuffer to SrsSimpleStream	2015-09-22 08:59:52 +08:00
winlin	dadfe101b4	rename SrsBitStream to SrsBitBuffer	2015-09-22 08:59:21 +08:00
winlin	0e52fc6d5b	rename SrsStream to SrsBuffer	2015-09-22 08:57:31 +08:00
winlin	ca3577e11b	rename temp to stream	2015-09-22 08:52:00 +08:00
winlin	f33d736442	rename kernel stream to buffer	2015-09-22 08:50:14 +08:00
winlin	a4f51564db	rename kernel stream to buffer	2015-09-22 08:48:55 +08:00
winlin	495f575ac3	rename kernel buffer to temp	2015-09-22 08:43:56 +08:00
winlin	ac2b03a3ed	rename srs_kernel_buffer to temp	2015-09-22 08:42:54 +08:00
winlin	faf6d15878	add replace script.	2015-09-21 18:32:17 +08:00
winlin	1de2bb0801	add kafka protocol files.	2015-09-21 17:12:28 +08:00
winlin	874ae85e47	update readme.	2015-09-21 14:26:31 +08:00
winlin	22d6ec4f93	update readme.	2015-09-21 14:24:06 +08:00
winlin	841d9ee5ad	update readme.	2015-09-21 14:20:30 +08:00
winlin	f07d7dcf35	update readme.	2015-09-21 14:19:07 +08:00
winlin	ddb0dcdcaa	update readme.	2015-09-21 14:13:07 +08:00
winlin	99e27c035a	update readme.	2015-09-21 13:52:16 +08:00
winlin	0fb353f1f6	update readme.	2015-09-21 13:50:01 +08:00
winlin	e5581981d4	Merge branch '2.0release' into develop	2015-09-21 13:39:15 +08:00
winlin	534a8c9fa3	update readme.	2015-09-21 13:39:08 +08:00
winlin	bbbb4e5025	update readme.	2015-09-21 13:37:42 +08:00
winlin	e5429fef02	update readme.	2015-09-21 13:34:28 +08:00
winlin	a6377fe456	refine readme	2015-09-21 13:26:08 +08:00
winlin	533b9a5cfb	Merge branch '2.0release' into develop	2015-09-21 13:24:34 +08:00
winlin	87d007d087	refine readme	2015-09-21 13:24:29 +08:00
winlin	f42cd55078	refine readme	2015-09-21 13:24:05 +08:00
winlin	2d99e8a563	refine readme	2015-09-21 13:20:04 +08:00
winlin	d129c1079b	refine readme	2015-09-21 13:19:32 +08:00
winlin	21fa01d706	refine readme	2015-09-21 13:19:06 +08:00
winlin	03c2884f8c	refine readme	2015-09-21 13:17:54 +08:00
winlin	c90e117bbf	refine readme	2015-09-21 12:41:45 +08:00
winlin	d98fc58e8b	refine readme	2015-09-21 12:32:14 +08:00
winlin	b5996567e8	refine the role of srs, to cluster.	2015-09-21 12:09:09 +08:00
winlin	e4e36a0166	merge from srs2, fix openssl build	2015-09-21 12:03:47 +08:00
winlin	d8a64aaab5	fix #484, hotfix the openssl build script 2.0.190	2015-09-21 12:01:48 +08:00
winlin	b471c6e61c	refine code, use json integter rather than number.	2015-09-19 14:40:32 +08:00
winlin	c5cd58761c	move the srs thread to st.	2015-09-19 13:46:55 +08:00
winlin	3042115385	refine json to_str to dumps.	2015-09-19 13:37:56 +08:00
winlin	b59d9ba6a1	support amf0 and json to convert with each other.	2015-09-19 13:31:57 +08:00
winlin	3f7e69b617	json objects support dumps to string.	2015-09-19 12:27:31 +08:00
winlin	b78781707e	update the srs player	2015-09-17 18:07:02 +08:00
winlin	5073a6fa08	merge from srs2	2015-09-17 18:06:03 +08:00