108 commits

Author	SHA1	Message	Date
winlin	82190d7fa2	change server name to demo, dev used for development vhost	2013-12-01 14:11:07 +08:00
winlin	9d65cd1c9f	change server name to demo, dev used for development vhost	2013-12-01 14:08:28 +08:00
winlin	35676920be	convert to unix format	2013-12-01 13:05:43 +08:00
winlin	18028ad4cb	update readme	2013-12-01 13:04:09 +08:00
winlin	bf18a3ac96	change demo video to 200kbps	2013-12-01 12:41:52 +08:00
winlin	bbf7b9bb01	disable the forward for bug. update the steps	2013-12-01 12:31:23 +08:00
winlin	ec28513941	Update README.md	2013-12-01 12:29:40 +08:00
winlin	41fcda1d86	use hosts to play stream	2013-12-01 12:25:04 +08:00
winlin	5502344e85	add forward sample	2013-12-01 12:16:57 +08:00
winlin	5cc1ad6da8	add drawtext filter sample	2013-12-01 12:04:00 +08:00
winlin	ecec80ab43	support all ffmpeg filters and params.	2013-12-01 11:25:15 +08:00
winlin	1da09e5ffb	add sample video	2013-12-01 11:24:26 +08:00
winlin	9a0d8855d8	support ffmpeg filter	2013-12-01 10:54:41 +08:00
winlin	52e6115f9a	update readme	2013-11-30 23:12:47 +08:00
winlin	100a48795f	update readme	2013-11-30 23:08:51 +08:00
winlin	dd066a4973	update readme	2013-11-30 23:06:25 +08:00
winlin	ce15f4bce3	update encoder framework	2013-11-30 19:14:19 +08:00
winlin	c69933d68b	add transcoding params to config	2013-11-30 16:24:03 +08:00
winlin	57064237d0	rename author to contributor	2013-11-30 14:35:59 +08:00
winlin	14c2585cc3	add build ffmpeg script	2013-11-30 11:59:21 +08:00
winlin	df53681a07	add ffmpeg-2.1, x264-core138, lame-3.99.5, libaacplus-2.0.2.	2013-11-30 11:50:00 +08:00
winlin	7bec2823f8	update readme	2013-11-30 10:58:52 +08:00
winlin	6fdd5d693b	update readme	2013-11-30 10:57:25 +08:00
winlin	6f7f94dad8	update readme	2013-11-30 10:56:21 +08:00
winlin	d5925feab1	merge from winterserver	2013-11-30 09:36:47 +08:00
winlin	cabf6e0374	Merge branch 'master' of github.com:winlinvip/simple-rtmp-server	2013-11-30 09:14:50 +08:00
winlin	2b8f3d2467	update readme	2013-11-30 09:14:09 +08:00
winlin	aacaf3be5f	update readme	2013-11-30 09:07:22 +08:00
winlin	f4481d3efe	update readme	2013-11-30 08:57:07 +08:00
winterserver	9c5c9fd00a	update readme	2013-11-30 08:54:37 +08:00
winlin	726710c938	update readme	2013-11-30 08:51:51 +08:00
winlin	cd342c1fbe	add new plan	2013-11-30 08:23:35 +08:00
winlin	d3e462f7e5	add new plan	2013-11-30 08:21:41 +08:00
winlin	726dfd6400	add new plan	2013-11-30 08:17:45 +08:00
winlin	b20656cdd4	update readme	2013-11-29 23:11:22 +08:00
winlin	0abee6bdfb	add new plans	2013-11-29 23:04:18 +08:00
winlin	23e42cde3d	update 0.6 release note	2013-11-29 22:29:48 +08:00
winlin	dc8a7771ba	update 0.6 release note	2013-11-29 22:27:29 +08:00
winlin	3198a9542a	add 0.6release note	2013-11-29 22:25:02 +08:00
winlin	db405b7e0e	support forward stream to origin/edge	2013-11-29 22:20:51 +08:00
winlin	4548bebc33	update readme	2013-11-28 19:31:04 +08:00
winlin	023e23bc82	add performance test	2013-11-28 19:25:56 +08:00
winlin	4c4bbd0529	update readme	2013-11-27 23:31:39 +08:00
winlin	a26c28334e	update readme	2013-11-27 23:27:55 +08:00
winlin	ec5cb39b96	add options --with/without -hls/ssl	2013-11-27 22:41:58 +08:00
winlin	f8855cfcbb	fix the aac jump bug on iphone, correct the audio pts, use audio buffer and flush audio	2013-11-27 17:30:16 +08:00
winlin	1f1fdd572d	update readme	2013-11-26 18:17:24 +08:00
winlin	5b1d24ce5d	v0.5 released	2013-11-26 18:13:44 +08:00
winlin	00ec634d56	support hls_fragment and hls_window	2013-11-26 17:48:35 +08:00
winlin	57ea56970d	add nginx and used as http server	2013-11-26 16:45:50 +08:00