2457 commits

Author	SHA1	Message	Date
winlin	22491b0c99	merge from 2.0	2015-08-19 14:21:12 +08:00
winlin	f691dddc1a	drop metadata when drop sequence header. support PCUC 0x1a	2015-08-19 14:20:31 +08:00
winlin	2cf526ffc7	close #454, support obs restart publish. 2.0.184	2015-08-18 17:43:01 +08:00
winlin	0cb7ddfe8c	Merge branch '2.0release' into develop	2015-08-18 14:09:05 +08:00
winlin	ccc4c05da9	fix #229, support vs2010 for srslibrtmp.	2015-08-18 14:08:54 +08:00
winlin	f53b2556bb	Merge branch '2.0release' into develop	2015-08-17 16:34:21 +08:00
winlin	01be68fe58	refine code, donot remove the detail when hls disabled.	2015-08-17 16:34:11 +08:00
winlin	53351cd645	Merge branch '2.0release' into develop	2015-08-14 15:51:15 +08:00
winlin	afd05f71c3	refine code, use size cache for performance issue.	2015-08-14 15:51:02 +08:00
winlin	0b90af7e46	Merge branch '2.0release' into develop	2015-08-14 15:47:36 +08:00
winlin	3b0b2e0b85	fix the bug to support dump packets with count.	2015-08-14 15:47:29 +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	9fbff4b8f9	Merge branch '2.0release' into develop	2015-08-14 11:15:29 +08:00
winlin	b79d830e2c	refine the default smi	2015-08-14 11:15:23 +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	0b84c1d962	Merge branch '2.0release' into develop	2015-08-12 18:02:40 +08:00
winlin	7dcba040eb	refine config.	2015-08-12 18:02:31 +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	1261916eab	refine the mount and dir to /console	2015-08-12 12:49:22 +08:00
winlin	b27bb48447	refine the version	2015-08-12 08:18:45 +08:00
winlin	eab538d2e4	fix the version of srs2	2015-08-11 18:37:50 +08:00
winlin	f28c9b7eb5	merge from 2.0release	2015-08-11 15:49:48 +08:00
winlin	3a6854fc2e	refine code.	2015-08-11 15:36:14 +08:00
lovacat	e8c0ca7af0	fix #442: HTTP API kickoff client.	2015-08-11 15:23:46 +08:00
winlin	d761ebfa55	refine the api, move the requests and errors to rest.	2015-08-11 13:09:21 +08:00
winlin	c5bf397295	fix the http error header.	2015-08-10 16:41:25 +08:00
winlin	fbcc07d85a	fix the typo of AUTIO.	2015-08-05 22:54:29 +08:00
winlin	0e3128d3e3	Merge branch '2.0release' into develop	2015-08-03 15:23:07 +08:00
winlin	65b2ed7ac5	refine code, move the order of functions.	2015-08-03 14:11:21 +08:00
winlin	71f2726b31	fix bug of merge code for reload http_remux for vhost	2015-08-03 13:44:24 +08:00
winlin	ccf6a4de1e	remove the on_reload_vhost_http_remux_updated for vhost added.	2015-08-03 13:35:25 +08:00
winlin	bfe0f97edd	refine params nameing and SrsStream.	2015-07-28 18:08:11 +08:00
winlin	8d86eb6516	refine code naming or comments.	2015-07-28 17:56:50 +08:00
winlin	c2d9c98678	Merge branch '2.0release' into develop	2015-07-23 14:20:57 +08:00
winlin	bc033d5de3	refine code, move default to config function.	2015-07-23 14:20:46 +08:00
zhengfl	39a2d51c66	fix #445, 修正由skip(-4)引起的assert错误	2015-07-22 12:10:19 +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	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	3b65af9bd2	fix the hstrs bug on edge.	2015-07-17 14:05:34 +08:00
winlin	99db2888e7	refine code for hstrs.	2015-07-16 18:42:27 +08:00
winlin	c2ef779523	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	2015-07-16 17:31:31 +08:00
winlin	366d3a3f56	for #441, use 30s timeout for first msg. 2.0.178	2015-07-16 17:30:27 +08:00