1946 commits

Author	SHA1	Message	Date
winlin	e5646e3bb5	refine ingester, add vhost/id info to ingester	2014-04-10 09:20:23 +08:00
winlin	9372a7065a	refine the ingest log	2014-04-08 18:01:14 +08:00
winlin	ccf0a423be	change sleep time from 3s to 0.6s for ingester.	2014-04-08 15:43:47 +08:00
winlin	509504f27d	change sleep time from 3s to 0.6s	2014-04-08 15:43:18 +08:00
winlin	5aded78272	change to 0.9.56, for macro changed	2014-04-08 15:32:13 +08:00
winlin	eba35e2ac0	refine the macro SRS_FFMPEG to SRS_FFMPEG_STUB, SRS_FFMPEG_TOOL to build ffmpeg tool	2014-04-08 15:28:34 +08:00
winlin	70e73bc281	add comments for bug #39	2014-04-08 13:56:45 +08:00
winlin	d124772d6a	add http server/api to srs.conf. add comments for bug #6.	2014-04-08 13:54:16 +08:00
winlin	98809862f7	change to 0.9.55, for 1.0 mainline	2014-04-07 16:05:18 +08:00
winlin	12ba02238d	update readme, add ingest	2014-04-07 15:56:19 +08:00
winlin	c11e266d5c	update readme	2014-04-07 15:04:31 +08:00
winlin	4f445f2f60	support ingest stream	2014-04-07 14:28:06 +08:00
winlin	45d8f4346f	implements ingest, change to 0.9.53	2014-04-07 14:20:26 +08:00
winlin	e89ab84e4e	implements ingest, change to 0.9.53	2014-04-07 14:20:03 +08:00
winlin	2742679354	implements the ingest framework	2014-04-07 13:32:00 +08:00
winlin	92281548b6	add ingest config	2014-04-07 13:13:57 +08:00
winlin	9107831b0e	add config to read ingesters	2014-04-07 11:57:24 +08:00
winlin	f5c4f492da	add comments for ffmpeg	2014-04-07 11:49:20 +08:00
winlin	c759a7c6b5	refine log of ffmpeg	2014-04-07 11:20:03 +08:00
winlin	4f7cfeed37	change to 0.9.52, refine encoder and ffmpeg	2014-04-07 10:15:44 +08:00
winlin	72c330d47c	refine ffmepg and encoder, extract ffmpeg.	2014-04-07 09:34:36 +08:00
winlin	095364a72b	refine ingest, start/stop ingest in server	2014-04-07 09:27:30 +08:00
winlin	eea2310b07	refine consts	2014-04-07 09:07:12 +08:00
winlin	4a7378b77a	ingest stream when server cycle	2014-04-07 08:41:32 +08:00
winlin	adfbbbfd68	add ingest files	2014-04-07 08:32:28 +08:00
winlin	983fe46ce2	use --with-ffmpeg to compile FFMPEG tool only, use --with-transcode for transcoding	2014-04-06 20:30:51 +08:00
winlin	c4524484e6	add comments for aac encoder	2014-04-06 18:48:39 +08:00
winlin	7916cab50e	donot check the aac encoder, ensure aac is ok	2014-04-05 15:01:41 +08:00
winlin	30e3323fe4	update readme, add SampleHTTP link	2014-04-05 13:38:05 +08:00
winlin	4e3fe36ae2	refine http server pages. change to 0.9.51	2014-04-05 13:14:59 +08:00
winlin	1c02f4551c	always use 64bits for lseek	2014-04-04 23:28:31 +08:00
winlin	ced050829e	fix bug of http, change to 0.9.50	2014-04-04 23:25:32 +08:00
winlin	c5d3b11a6e	update http stream. change to 0.9.49	2014-04-04 23:16:31 +08:00
winlin	17ce21348d	implements the http stream module. change to 0.9.49	2014-04-04 23:06:46 +08:00
winlin	ef26e77560	implements the http stream module.	2014-04-04 23:06:27 +08:00
winlin	00eda0d7b2	implements the http stream module.	2014-04-04 23:04:38 +08:00
winlin	83f35d10b1	add http delivery framework	2014-04-04 18:55:21 +08:00
winlin	8d7877ebd1	refine config, group by sections.	2014-04-04 17:01:34 +08:00
winlin	b7093246e4	fix forward conf file bug, change pid file. change to 0.9.48	2014-04-04 15:35:17 +08:00
winlin	28b0c3a27f	refine log and thread function name. change to 0.9.47.	2014-04-04 12:18:26 +08:00
winlin	6d32ad1828	refine log and thread function name	2014-04-04 12:18:05 +08:00
winlin	f089eafd9f	fix bug #38, remove app slash of jwplayer, change to 0.9.46	2014-04-04 10:12:34 +08:00
winlin	3f13726544	add log level in conf. change to 0.9.45	2014-04-03 18:32:51 +08:00
winlin	4984631cd6	refine the http crossdomain, send it only required	2014-04-03 16:39:55 +08:00
winlin	133a6f0dbf	add crossdomain support for http error	2014-04-03 15:55:48 +08:00
winlin	b71eb0d49a	support more splash in http url. remove the strip of SrsRequest, use srs_string_remove instead, change to 0.9.44	2014-04-03 15:53:56 +08:00
winlin	f2216691f9	remove the duplicated http status line when error	2014-04-03 15:20:24 +08:00
winlin	818c1f1520	support http error code, check url	2014-04-03 15:17:02 +08:00
winlin	0ae23d7556	rename version to versions	2014-04-03 14:17:00 +08:00
winlin	4a40075f68	add contributors to api/v1/authors	2014-04-03 13:48:52 +08:00