24 commits

Author	SHA1	Message	Date
winlin	1721e4ea4b	Fix #1059, support vhost in stream parameters. 2.0.246	2018-02-13 08:31:25 +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	2830ee12c1	fix the on_hls.ts_url bug.	2015-12-11 11:29:10 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	baa892a762	merge srs_app_st_socket to srs_app_st.	2015-06-14 08:43:38 +08:00
winlin	d103557a8b	merge the rtmp sdk to stack.	2015-06-13 16:04:59 +08:00
winlin	e5461d2df9	refine code	2015-05-28 07:03:38 +08:00
winlin	fec8422d6b	fix bug of configure.	2015-05-27 10:23:40 +08:00
winlin	c1b9541b5c	support disable all	2015-05-27 07:22:44 +08:00
winlin	6bfb743aa0	remove the unused app http file	2015-05-22 22:38:15 +08:00
winlin	f0ae66a081	merge the app http to conn.	2015-05-22 22:34:03 +08:00
winlin	ce1bb6c605	refine code, extrat the ISrsHttpMessage.	2015-05-22 22:24:05 +08:00
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	77ee2400df	fix the unicode to ascii	2015-05-09 23:12:12 +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	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +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	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