1129 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	47927ab460	refine options, change to 0.9.66	2014-04-16 13:24:00 +08:00
winlin	cc338fdb7c	fix bug for default configure	2014-04-16 12:37:19 +08:00
winlin	005502a07e	update comments for HLS on_hls_start	2014-04-16 11:11:53 +08:00
winlin	642fc19f9d	update api server demo	2014-04-16 11:03:58 +08:00
winlin	fd0002e499	add dvr framework	2014-04-16 09:28:02 +08:00
winlin	96115ac4f7	fix bug of config params. x86/x64/pi never use static	2014-04-15 16:07:25 +08:00
winlin	90dee0924d	fix bug of build script	2014-04-15 14:24:03 +08:00
winlin	23a1b29935	add dvr option. refine macros of auto headers	2014-04-15 14:01:57 +08:00
winlin	1ae9178605	add favicon.ico, change to 0.9.65	2014-04-15 11:19:15 +08:00
winlin	b1877db405	fix typo of full.conf. fix api server bug	2014-04-14 17:31:59 +08:00
winlin	b86c83b0e0	refine the info for log to file.	2014-04-14 12:14:01 +08:00
winlin	ce64dafc3c	use stream time for live duration. change to 0.9.64	2014-04-14 10:55:46 +08:00
winlin	2c6b6c6846	fix bug #47: use stream time to stop for duration of rtmpdump	2014-04-14 10:51:31 +08:00
winlin	bcfe82f88f	update options for configure help	2014-04-14 10:02:50 +08:00
winlin	73c310cd2e	refine the macro.	2014-04-14 09:10:36 +08:00
winlin	bc756d6ad9	fix simple handshake bug #46, copy c1 to s2. change to 0.9.63	2014-04-13 21:55:01 +08:00
winlin	9a036958d7	fix bug #45, support duration for live. change to 0.9.62	2014-04-13 21:37:26 +08:00
winlin	04a526b340	change SRS_TRANSCODE macro to SRS_RTMP_TRANSCODE	2014-04-13 17:14:33 +08:00
winlin	a0472f256d	support test config file. change to 0.9.61	2014-04-13 16:55:42 +08:00
winlin	f980340e89	refine config option	2014-04-13 13:57:39 +08:00
winlin	aa784377fd	refine reload, ignore if parse config file failed.	2014-04-13 13:50:58 +08:00
winlin	cfee761899	support full reload. change to 0.9.60	2014-04-13 13:35:03 +08:00
winlin	bb87272c39	refine reload, rename some vhost specified to add vhost prefix	2014-04-13 13:31:59 +08:00
winlin	dc3c3cff8e	support reload http_stream	2014-04-13 13:27:51 +08:00
winlin	c33ff4fdb8	support reload http_api	2014-04-13 13:08:10 +08:00
winlin	17ac29d160	refine code for reload http api/stream	2014-04-12 22:16:39 +08:00
winlin	821b58af03	support reload atc	2014-04-12 22:00:27 +08:00
winlin	eda1ddc03d	support reload log level/logfile/tank	2014-04-12 21:35:26 +08:00
winlin	f652c28485	support reload pid.	2014-04-12 20:46:32 +08:00
winlin	0a016e58bf	add comments for main	2014-04-12 20:37:16 +08:00
winlin	b38df9cd1a	refine main object(server, config, log, context), handler reload in intialize(), change to 0.9.59	2014-04-12 20:35:40 +08:00
winlin	7c64a893f5	add demo.m3u8 and demo.html	2014-04-11 15:26:37 +08:00
winlin	9eb76cb1eb	update demo.conf	2014-04-11 14:40:38 +08:00
winlin	189da7e12e	fix bug of demo.conf	2014-04-11 14:23:19 +08:00
winlin	15f651bccd	update demo, support acodec	2014-04-11 14:13:14 +08:00
winlin	acdd5a827e	update api server, support servers	2014-04-11 11:29:17 +08:00
winlin	ff90278048	add speex1.2 to transcode flash encoder stream. change to 0.9.58	2014-04-11 10:40:21 +08:00
winlin	64727ce616	add bandwidth test conf	2014-04-10 17:41:55 +08:00
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