914 commits

Author	SHA1	Message	Date
winlin	0e3128d3e3	Merge branch '2.0release' into develop	2015-08-03 15:23:07 +08:00
winlin	a62d1cdf2a	refine the readme	2015-07-30 17:47:40 +08:00
winlin	de64f6829d	update readme	2015-07-27 14:14:59 +08:00
winlin	3d5fbc7a61	update README, remove the 1.0history.	2015-07-27 14:13:12 +08:00
winlin	4c3d3013a2	Merge branch '2.0release' into develop	2015-07-23 14:35:04 +08:00
winlin	cd8be3f194	Update README.md	2015-07-23 14:34:22 +08:00
winlin	fb46481fc7	Update README.md	2015-07-23 14:30:58 +08:00
winlin	9e6746fcaa	Update README.md	2015-07-23 14:29:37 +08:00
winlin	94569b181f	merge from 2.0	2015-07-21 12:08:05 +08:00
winlin	c85f92c229	fix #169, support default values for transcode. 2.0.180	2015-07-21 12:07:26 +08:00
winlin	48c040c92b	Merge branch '2.0release' into develop	2015-07-21 11:41:13 +08:00
winlin	89183c52c9	update hls and transcode wiki	2015-07-21 11:41:02 +08:00
winlin	31d2de3f23	fix #435, add pageUrl for HTTP callback on_play.	2015-07-21 10:50:57 +08:00
winlin	146a44a2ce	merge from 2.0	2015-07-20 09:32:46 +08:00
winlin	b54f9b0f94	refine the hls, ignore packet when no sequence header. 2.0.179	2015-07-20 09:31:46 +08:00
winlin	fdb17a1864	merge from 2.0	2015-07-17 14:06:15 +08:00
winlin	366d3a3f56	for #441, use 30s timeout for first msg. 2.0.178	2015-07-16 17:30:27 +08:00
winlin	8e293f927f	merge 2.0release	2015-07-14 11:47:08 +08:00
winlin	5f77724021	refine hls disable the time jitter, support not mix monotonically increase. 2.0.177	2015-07-14 11:46:23 +08:00
winlin	5f91fbc970	merge from 2.0release	2015-07-14 11:32:40 +08:00
winlin	ef5ddd01e4	Update README.md	2015-07-13 12:08:53 +08:00
winlin	c8fef99cb6	merge from 2.0release	2015-07-01 14:51:27 +08:00
winlin	438914c481	fix #433, fix the sps parse bug. 2.0.176	2015-07-01 14:50:45 +08:00
winlin	8951752086	Merge branch '2.0release' into develop	2015-06-17 16:47:08 +08:00
Jonathan Barratt	2e437a28b4	Update README.md ... Correct path in installation instructions since project repository renamed to srs from simple-rtmp-server	2015-06-17 16:46:39 +08:00
winlin	b0ce38dc8f	merge from 2.0	2015-06-10 15:38:44 +08:00
winlin	56938efdbd	fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175	2015-06-10 15:38:13 +08:00
winlin	12eab8a128	merge from srs2.	2015-06-10 13:53:57 +08:00
winlin	6941f2c072	fix #424, fix aggregate timestamp bug. 2.0.174	2015-06-10 13:53:13 +08:00
winlin	5d75e32e1d	Merge branch '2.0release' into develop	2015-06-06 21:24:06 +08:00
winlin	a1dd734318	fix #421, drop video for unkown RTMP header.	2015-06-06 21:23:57 +08:00
winlin	d10d57716a	Merge branch '2.0release' into develop	2015-06-05 21:34:39 +08:00
winlin	26b76c0e4c	fix #420, remove ts for hls ram mode.	2015-06-05 20:38:01 +08:00
winlin	9dce971d57	merge from srs2	2015-05-30 14:41:47 +08:00
winlin	223ae194b1	fix #209, cleanup hls when stop and timeout. 2.0.173.	2015-05-30 14:41:09 +08:00
winlin	4a80a5a71e	for #209, support cleanup when srs stop.	2015-05-30 13:48:29 +08:00
winlin	597993d414	support pure video hls.	2015-05-29 21:53:37 +08:00
winlin	5caafadd45	fix #409: support pure video hls. 2.0.172.	2015-05-29 21:43:17 +08:00
winlin	3ad030fe83	add HLS overload	2015-05-29 17:56:05 +08:00
winlin	27a1fee6b9	Merge branch '2.0release' into develop	2015-05-28 21:02:50 +08:00
winlin	41ead65345	support [srs-dolphin][srs-dolphin], the multiple-process SRS.	2015-05-28 19:58:16 +08:00
winlin	b44987fac7	Merge branch '2.0release' into develop	2015-05-28 14:59:19 +08:00
winlin	9ab579c6e8	refine the configure test script.	2015-05-27 07:06:16 +08:00
winlin	7349fed8b1	Merge branch '2.0release' into develop	2015-05-25 09:59:57 +08:00
winlin	8afeb29d8d	update readme	2015-05-25 09:27:25 +08:00
winlin	cd162c2848	merge from 2.0	2015-05-25 01:04:04 +08:00
winlin	9e9f38133d	update readme.	2015-05-25 01:03:34 +08:00
winlin	d12fc7fcc5	fix #405, improve the HTTP FLV performance to 6k. 2.0.171	2015-05-25 01:02:06 +08:00
winlin	4df19ba99a	for #405, improve the http flv to 3k. 2.0.170	2015-05-24 23:29:17 +08:00
winlin	0e1ac2b923	update readme	2015-05-24 22:54:49 +08:00