7 commits

Author	SHA1	Message	Date
winlin	49308dddfb	update 2015 to 2016	2015-12-23 11:41:41 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	b23e196f20	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:38:23 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	bb3c88fef7	change copyright from 2013 to 2013-2014.	2014-01-01 10:37:12 +08:00
winlin	525af4599f	support live stream transcoding by ffmpeg.	2013-11-30 23:04:47 +08:00
winlin	ee18b9f537	add ffempty	2013-11-30 21:56:50 +08:00