1067 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	d6d371eba6	update reame, update the link of latest download	2014-04-07 17:22:38 +08:00
winlin	3b59a6c687	fix bug of package for arm	2014-04-07 17:03:56 +08:00
winlin	667191913b	fix bug of package for arm	2014-04-07 17:01:48 +08:00
winlin	5c9941989e	fix bug of package for arm	2014-04-07 16:57:05 +08:00
winlin	503fb93d4e	fix bug of package for arm	2014-04-07 16:56:45 +08:00
winlin	5fd582cd26	fix bug of package for arm	2014-04-07 16:52:38 +08:00
winlin	a8c5db3fc7	fix bug of package for arm	2014-04-07 16:51:39 +08:00
winlin	6e88634c5c	add transcode to package	2014-04-07 16:35:24 +08:00
winlin	9a8eeb685d	update package, add http server and api.	2014-04-07 16:33:31 +08:00
winlin	786ba5beff	update readme.	2014-04-07 16:22:49 +08:00
winlin	ffe05b6e37	update readme.	2014-04-07 16:19:28 +08:00
winlin	ddc6af2924	update readme.	2014-04-07 16:17:45 +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	05e22e9530	fix script run/build/stop bug	2014-04-07 15:26:21 +08:00
winlin	6f3af97068	update readme	2014-04-07 15:10:59 +08:00
winlin	c11e266d5c	update readme	2014-04-07 15:04:31 +08:00
winlin	3d073f9ef6	update demo script, remove ffmpeg publish. use ingest instead	2014-04-07 14:33:27 +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	7384ad0caa	add ingest config section of full.conf	2014-04-06 21:26:57 +08:00
winlin	5e6c490ba0	add ingest compile feature	2014-04-06 21:05:18 +08:00
winlin	e80abac4f0	add ingest feature to readme	2014-04-06 20:59:58 +08:00
winlin	d1f15650e7	update readme.	2014-04-06 20:31:20 +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	5ff1d589f7	change warn to trace for nginx disabled	2014-04-06 19:19:13 +08:00
winlin	d546f815df	update build/run/stop script	2014-04-06 19:13:29 +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	7de8bd7595	allow pi to use ffmpeg	2014-04-05 14:38:19 +08:00
winlin	2949c751f6	update install, create http root	2014-04-05 14:17:49 +08:00
winlin	43979f7505	add htt.hls sample	2014-04-05 13:56:14 +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