wenjiegit 3753e8c5f1 merge upstream		2013-12-24 10:38:38 +08:00
..
api-server	support http hooks: on_connect/close/publish/unpublish/play/stop.	2013-12-08 12:45:12 +08:00
ffempty	support live stream transcoding by ffmpeg.	2013-11-30 23:04:47 +08:00
hls	add research empty ffmpeg	2013-11-30 21:53:42 +08:00
players	update the publisher, to auto prompt the dialog to get the publisher.	2013-12-22 10:57:50 +08:00
SrsBW	add bandcheck code and modified srs code for merge	2013-12-21 16:18:46 +08:00