6391 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	3a26b23fba	change ffmpeg log to ./objs	2014-04-10 17:19:49 +08:00
winlin	ca02cfe1bf	update server.py	2014-04-10 16:33:45 +08:00
winlin	c3c2767363	update api server, add servers	2014-04-10 15:06:18 +08:00
winlin	8295169e0e	refine code, unify the coding style	2014-04-10 14:22:09 +08:00
winlin	74cb41469c	update reame, add flash p2p to no-plan	2014-04-10 14:21:05 +08:00
winlin	ccba9ba9ba	move log level parse to app utility	2014-04-10 14:20:02 +08:00
winlin	f2f30dcc52	add utility, change log to trace	2014-04-10 14:12:22 +08:00
winlin	94874e77af	refine reload config	2014-04-10 14:06:23 +08:00
winlin	6c5d8b4851	refine reload config	2014-04-10 14:05:01 +08:00
winlin	bc61b1de18	fix bug of reload ingest	2014-04-10 11:47:38 +08:00
winlin	e0a6fe63cc	fix bug of reload ffmpeg, support multiple transcode, change to 0.9.57	2014-04-10 11:40:06 +08:00
winlin	9ed3421586	rename from get_ingest to get_ingest_by_id of config	2014-04-10 11:24:27 +08:00
winlin	e432fe931f	support reload ingesters(added/removed/updated). change to 0.9.57.	2014-04-10 11:21:47 +08:00
winlin	e6d8bc1e5c	ingest reload: support disable vhost	2014-04-10 10:35:02 +08:00
winlin	5e504944dc	add comments for http conn	2014-04-10 10:22:22 +08:00
winlin	dc71eef394	support ingest reload: add new vhost with ingester	2014-04-10 10:09:30 +08:00
winlin	e5646e3bb5	refine ingester, add vhost/id info to ingester	2014-04-10 09:20:23 +08:00
winlin	017b96f9b5	fix the heartbleed bug, see: http://www.openssl.org/news/secadv_20140407.txt	2014-04-09 11:51:05 +08:00
winlin	056895a978	add comments for the heartbleed bug, see: http://www.openssl.org/news/secadv_20140407.txt	2014-04-09 11:06:53 +08:00
winlin	9372a7065a	refine the ingest log	2014-04-08 18:01:14 +08:00
winlin	4af7b6e383	update conf file, add id for ingest.	2014-04-08 15:51:43 +08:00
winlin	5a3b59d3c8	update conf file, add id for ingest.	2014-04-08 15:47:52 +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	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