5 commits

Author	SHA1	Message	Date
wenjiegit	54bd613cf5	update master	2014-01-02 18:17:39 +08:00
wenjiegit	f8a7db51f2	fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number]	2014-01-02 14:16:26 +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