2910 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	44bc7976ac	merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.	2015-05-19 18:06:20 +08:00
winlin	0f7cafe50b	order the xcode project	2015-05-15 14:34:59 +08:00
winlin	c617d2aaa5	support push flv stream over HTTP POST to SRS.	2015-05-10 10:35:35 +08:00
winlin	77ee2400df	fix the unicode to ascii	2015-05-09 23:12:12 +08:00
winlin	7fc1cda392	add stream status to api.	2015-05-08 16:45:25 +08:00
winlin	ac13817aae	update donation	2015-05-08 07:04:31 +08:00
winlin	0fd23c85cc	update donation	2015-05-07 11:48:36 +08:00
winlin	f6252c7f72	enable hls for push flv.	2015-05-07 11:07:32 +08:00
winlin	99e4bad56f	update donation.	2015-05-06 22:04:47 +08:00
winlin	ffdabf32ed	add push flv conf	2015-05-05 11:44:20 +08:00
winlin	e221d002a2	fix the flv caster bug, when nread is 0, disconnect it.	2015-05-05 07:37:12 +08:00
winlin	ad32048c1c	fix the http flv stream caster.	2015-05-04 21:55:19 +08:00
winlin	cba6675560	refine the http message, set the connection if required.	2015-05-04 19:06:38 +08:00
winlin	ba6c3132e3	refine code, use decoder to parse flv stream	2015-05-04 18:28:41 +08:00
winlin	ea1e015a4e	fix the http read chunked encoding bug.	2015-05-04 18:11:52 +08:00
winlin	a95fd6d140	read the http flv stream.	2015-05-03 23:57:22 +08:00
winlin	022b6aa561	refine the http remux for http flv stream.	2015-05-03 23:34:59 +08:00
winlin	f0c24eeacc	add stream caster for post flv over http.	2015-05-03 10:56:20 +08:00
winlin	4d18073dab	update contact add skype.	2015-04-30 13:42:30 +08:00
winlin	4b372d8d16	change primary to the primary branch.	2015-04-29 18:46:47 +08:00
winlin	e63b8eda51	migarate to srs org.	2015-04-29 18:03:17 +08:00
winlin	8603dba697	migarate to srs org.	2015-04-29 18:01:16 +08:00
winlin	fff838e4c1	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:48:52 +08:00
winlin	b23e196f20	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:38:23 +08:00
winlin	90b80ffc45	migarate from winlinvip to srs org.	2015-04-29 17:28:15 +08:00
winlin	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
winlin	b3bd007f0d	update git commit	2015-04-29 15:09:03 +08:00
winlin	fc21986695	Merge branch '2.0release' of github.com:winlinvip/simple-rtmp-server into 2.0release	2015-04-29 09:25:25 +08:00
winlin	24739a409f	update donation for wangguanghui.	2015-04-29 09:24:56 +08:00
winlin	8a29889a94	Merge pull request #392 from tufang14/2.0release ... m3u8 mount bug	2015-04-25 20:48:09 +08:00
tufang14	b6d650cdb4	m3u8 mount bug	2015-04-25 14:59:12 +08:00
winlin	dbcd7d883b	add script check_hls_backup.sh to research hls.	2015-04-23 16:58:00 +08:00
winlin	e50996270e	fix the config parse error.	2015-04-23 16:25:49 +08:00
winlin	0acb942c3a	update on_hls, add ts_url, m3u8 and m3u8_url.	2015-04-23 12:05:24 +08:00
winlin	7b157b0678	refine hls ingester, quit when error.	2015-04-22 09:04:18 +08:00
winlin	aabe84046c	refine hls ingester, quit when error.	2015-04-22 09:01:38 +08:00
winlin	4e5ddb51e7	refine the overflow algorithm, prevent smaller piece.	2015-04-21 16:21:22 +08:00
winlin	1d973e2178	refine the overflow algorithm, prevent smaller piece.	2015-04-21 16:18:37 +08:00
winlin	d19dfa528e	abs overflow also plus the deviation, for pure audio hls.	2015-04-21 14:35:28 +08:00
winlin	c514a4ceeb	use atc for ingest hls aac time.	2015-04-21 12:58:54 +08:00
winlin	a28eec89b0	support ingest hls with m3u8 in m3u8.	2015-04-21 12:53:45 +08:00
winlin	ba6736839b	support hls ingest, fix the bugs.	2015-04-20 18:31:45 +08:00
winlin	2239e9f1fd	support ingest hls live stream to RTMP.	2015-04-20 16:25:48 +08:00
winlin	23b978c0bb	merge from github	2015-04-20 11:28:46 +08:00
winlin	623e37e22a	Merge branch '2.0release' of github.com:winlinvip/simple-rtmp-server into 2.0release	2015-04-20 11:28:20 +08:00
winlin	6e5c587e0a	support aac_adtstoasc filter to copy mode.	2015-04-20 11:24:12 +08:00
winlin	e12fd5bc94	Merge pull request #388 from neojiang/2.0release ... for #384,refine code for empty body request.	2015-04-19 13:17:21 +08:00
J	aca02b6d6b	for #384,refine code for empty body request.	2015-04-18 14:51:33 +08:00
J	8adbdc39e3	for #384,refine code for empty body request.	2015-04-18 14:42:16 +08:00
J	a71db53661	for #384,refine code for empty body request.	2015-04-18 14:33:57 +08:00