938 commits

Author	SHA1	Message	Date
winlin	b4040a5fc9	Merge branch '2.0release' into develop	2015-08-23 09:11:38 +08:00
winlin	724498bb09	update 2.0 release file to srs2.0a0	2015-08-23 09:11:32 +08:00
winlin	7e475e15b0	release 2.0a0	2015-08-23 09:00:57 +08:00
winlin	28791fd14a	release 2.0alpha0, the 2.0a0, 2.0.185	2015-08-23 09:00:21 +08:00
winlin	7a2836ae2a	Merge branch '2.0release' into develop	2015-08-22 19:49:39 +08:00
winlin	6e5143449e	HTTP API support JSONP by specifies the query string callback=xxx.	2015-08-22 18:18:18 +08:00
winlin	77765b463a	Merge branch '2.0release' into develop	2015-08-20 14:20:58 +08:00
winlin	575a698820	fix #380, srs-librtmp send sequence header when sps or pps changed.	2015-08-20 14:20:49 +08:00
winlin	f10e399991	Merge branch '2.0release' into develop	2015-08-19 19:02:40 +08:00
winlin	170ad05148	add gfps and nb_packets	2015-08-19 15:31:19 +08:00
winlin	22491b0c99	merge from 2.0	2015-08-19 14:21:12 +08:00
winlin	2cf526ffc7	close #454, support obs restart publish. 2.0.184	2015-08-18 17:43:01 +08:00
winlin	8d3d5dd10b	Merge branch '2.0release' into develop	2015-08-14 14:35:47 +08:00
winlin	a0a89a8ca6	use reduce_sequence_header for stream control.	2015-08-14 14:35:41 +08:00
winlin	807299589e	merge from srs2.	2015-08-14 11:14:33 +08:00
winlin	ae37fa8f3e	use send_min_interval for stream control. 2.0.183	2015-08-14 11:13:40 +08:00
winlin	a64340c2b5	Merge branch '2.0release' into develop	2015-08-13 21:58:08 +08:00
winlin	c02da33c11	add bytes api benchmark.	2015-08-13 21:57:18 +08:00
winlin	035cd40866	add bytes api benchmark.	2015-08-13 21:55:05 +08:00
winlin	653afd0700	merge from 2.0	2015-08-12 13:23:00 +08:00
winlin	9fb4640a8f	enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182	2015-08-12 13:22:09 +08:00
winlin	267846a3fa	for #442, support kickoff connected client. 2.0.181	2015-08-12 13:20:18 +08:00
winlin	6a39bf4731	refine for srs3	2015-08-11 15:52:25 +08:00
winlin	34fe51a85c	refine for 2.0release	2015-08-11 15:51:56 +08:00
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