4024 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	1ed5118246	refine the spaces, no TABS	2017-01-16 15:47:26 +08:00
winlin	750f4413c8	merge srs2 for #536	2017-01-16 12:47:48 +08:00
winlin	142a9733b2	refine encoder code for #536.	2017-01-16 12:42:25 +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	dda4f3381f	no donation anymore for SRS3+	2017-01-11 16:20:15 +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	6a8c232c5b	fix #588, kbps interface error. 2.0.228	2017-01-11 11:37:26 +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	0168589ab4	Merge pull request #737 from Himer/develop ... Update srs_app_source.cpp	2017-01-11 09:10:05 +08:00
Himer	afa704bca5	Update srs_app_source.cpp ... enabled 为true才进行转发实例创建	2017-01-10 21:16:49 +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	df983cc9ec	fix typo	2017-01-10 18:14:06 +08:00
winlin	a1ae48f4ac	Merge branch '2.0release' into develop	2017-01-10 18:07:52 +08:00
winlin	6fbda2ae3f	for #635, refine hls open/close gop.	2017-01-10 18:07:46 +08:00
winlin	07871a442e	fix typo	2017-01-10 17:18:22 +08:00
winlin	ae1920e91a	Merge branch '2.0release' into develop	2017-01-10 17:17:31 +08:00
winlin	4104f25069	for #635, support IDR and NonIDR(open-gop).	2017-01-10 17:17:23 +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	d49f195bbf	fix #734, log format error.	2017-01-10 09:36:51 +08:00
winlin	c46e925be5	add utest for avc uev	2017-01-09 18:14:25 +08:00
winlin	b7dd764920	update gitignore	2017-01-09 15:17:08 +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
winlin	10a0c6c10c	update for srs3	2017-01-06 17:55:06 +08:00
winlin	1b1ae00910	fix #727, install valgrind-devel	2017-01-06 17:51:07 +08:00
winlin	517812dbe2	remove test code for #730	2017-01-06 15:19:27 +08:00
winlin	1b175b1107	for #730, support config in/out ack size. 3.0.13	2017-01-06 14:57:54 +08:00
winlin	bbbc40f9c2	Merge branch '2.0release' into develop	2017-01-06 14:32:07 +08:00
winlin	aa2b7afb44	refine code, print protocol level info.	2017-01-06 14:32:01 +08:00
winlin	e434c09dc0	for #730, merge srs2	2017-01-06 14:13:19 +08:00
winlin	c67036d52e	for #730, reset ack follow flash player rules. 2.0.225	2017-01-06 14:04:34 +08:00
winlin	dc1f227aeb	for #730, refine code to decode the acknowledge message	2017-01-06 13:16:25 +08:00
winlin	d29416a5f0	add conf sample for ingest rtsp	2017-01-06 10:47:05 +08:00
winlin	4709d0214c	for #711, support prefile for transcode. 3.0.12	2017-01-06 10:39:37 +08:00
winlin	35cd4c407c	patch ST for valgrind and ARM. 3.0.11	2017-01-05 10:50:02 +08:00
winlin	f9a159cd21	patch ST for valgrind and ARM. 3.0.11	2017-01-05 10:45:41 +08:00
winlin	1581b15d86	update feature list	2017-01-05 10:10:27 +08:00
winlin	a4b82d7def	update feature list	2017-01-05 09:55:57 +08:00