1186 commits

Author	SHA1	Message	Date
winlin	2a4f57a587	Fix #301, User must config the codec in right way for HLS. 3.0.18	2017-02-12 20:55:35 +08:00
winlin	b0789c54e4	Update HLS wiki to v3	2017-02-11 14:28:40 +08:00
winlin	292f62ab0f	Update the wiki links	2017-02-11 14:13:55 +08:00
winlin	fdd81fa886	Update index	2017-02-11 14:03:13 +08:00
winlin	af0d98619a	Merge srs2	2017-02-11 13:55:45 +08:00
winlin	1cf24905ce	Update 2.0 wikis	2017-02-11 13:54:17 +08:00
winlin	ebc1be913f	Merge branch '2.0release' into develop	2017-02-10 13:15:51 +08:00
winlin	605192f448	add wechat link	2017-02-10 13:14:29 +08:00
winlin	72ceeaf2ff	Merge branch '2.0release' into develop	2017-02-10 12:54:55 +08:00
winlin	8d60318378	add wechat link	2017-02-10 12:54:04 +08:00
winlin	dd1929c7a1	add wechat link	2017-02-10 12:49:06 +08:00
winlin	e2d85d099e	update readme for DVR mp4	2017-02-09 15:43:40 +08:00
winlin	00abaf4df2	merge srs2, remove donation	2017-02-09 15:42:42 +08:00
winlin	455d9b285e	remove donation	2017-02-09 15:41:45 +08:00
winlin	5fec59ace2	merge from srs2, fix #503	2017-02-09 14:33:56 +08:00
winlin	99bffea328	fix #503, disable utilities when reload a source. 2.0.233	2017-02-09 14:29:57 +08:00
winlin	afbc3443f3	fix #738, support DVR general mp4. 3.0.17	2017-02-07 21:56:20 +08:00
winlin	e8eb050bf2	update readme	2017-02-03 14:57:28 +08:00
winlin	5c959fc781	merge from srs2, for kbps free io	2017-01-22 13:16:05 +08:00
winlin	6706bda42c	for #752, release the io then free it for kbps. 2.0.232	2017-01-22 13:12:56 +08:00
winlin	4cff49afd2	for #742, refine source, meta and origin hub. 3.0.16	2017-01-19 12:38:55 +08:00
winlin	6209945a07	Merge branch '2.0release' into develop	2017-01-18 19:34:00 +08:00
winlin	80dfe601b1	add link for #750	2017-01-18 19:33:54 +08:00
winlin	e8c48ac8f8	merge srs2, use specific error code for dns resolve	2017-01-18 16:05:33 +08:00
winlin	60be29f324	fix #750, use specific error code for dns resolve. 2.0.231	2017-01-18 16:03:57 +08:00
winlin	2656c97ccd	merge srs2. release r2.0b4	2017-01-18 12:18:59 +08:00
winlin	727652c56a	release r2.0b4, 2.0.230	2017-01-18 12:13:49 +08:00
winlin	310032d8d8	merge srs2, timestamp overflow for ATC.	2017-01-18 11:48:31 +08:00
winlin	d76419e3bb	fix #749, timestamp overflow for ATC. 2.0.230	2017-01-18 11:47:43 +08:00
winlin	dca9749f37	for #742, refine the object live cycle. 3.0.15	2017-01-17 10:44:13 +08:00
winlin	750f4413c8	merge srs2 for #536	2017-01-16 12:47:48 +08:00
winlin	ccb250f3bc	merge srs2. convert ts aac audio private stream 1 to common.	2017-01-11 17:43:29 +08:00
winlin	e6eafd3b97	fix #740, convert ts aac audio private stream 1 to common. 2.0.229	2017-01-11 17:42:34 +08:00
winlin	c902d0eb01	no donation anymore.	2017-01-11 13:06:39 +08:00
winlin	f92db0f87e	merge srs2 for kbps	2017-01-11 11:46:50 +08:00
winlin	fec6f96a8f	fix link for readme	2017-01-11 11:44:51 +08:00
winlin	c58dbe4d14	fix #588, kbps interface error. 2.0.228	2017-01-11 11:22:16 +08:00
winlin	7fe60b5bbf	fix #735 config transform refer_publish invalid. 3.0.14	2017-01-11 09:45:22 +08:00
winlin	7bbb3bae42	merge srs2	2017-01-11 09:33:26 +08:00
winlin	e3aa34ec5f	fix #736, recovery the hls dispose. 2.0.227	2017-01-11 09:25:48 +08:00
winlin	db231f6d37	refine hls html5 video template.	2017-01-10 18:43:36 +08:00
winlin	087a596a63	refine hls html5 video template.	2017-01-10 18:43:10 +08:00
winlin	1dd877c0d6	merge srs2	2017-01-10 11:17:37 +08:00
winlin	c9a71b7fb2	fix #635, hls support NonIDR(open gop). 2.0.226	2017-01-10 11:14:20 +08:00
winlin	15dfb0957c	update introduction for SRS3	2017-01-06 19:02:49 +08:00
winlin	8017311369	update introduction for SRS3	2017-01-06 19:01:43 +08:00
winlin	463ff9374f	update introduction for SRS3	2017-01-06 18:50:56 +08:00
winlin	7119b2a31e	update introduction for SRS3	2017-01-06 18:50:22 +08:00
winlin	309abde790	merge srs2	2017-01-06 18:18:02 +08:00
winlin	ba1c92a7b1	update readme	2017-01-06 18:17:11 +08:00