11 commits

Author	SHA1	Message	Date
winlin	5c959fc781	merge from srs2, for kbps free io	2017-01-22 13:16:05 +08:00
winlin	6706bda42c	for #752, release the io then free it for kbps. 2.0.232	2017-01-22 13:12:56 +08:00
winlin	f92db0f87e	merge srs2 for kbps	2017-01-11 11:46:50 +08:00
winlin	6a8c232c5b	fix #588, kbps interface error. 2.0.228	2017-01-11 11:37:26 +08:00
winlin	c58dbe4d14	fix #588, kbps interface error. 2.0.228	2017-01-11 11:22:16 +08:00
winlin	7ac932cfa0	update to 2013-2017	2016-12-16 11:57:25 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	2015-11-11 10:45:45 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	82ff05c1d4	rename rtmp io to protocol io	2015-09-22 09:07:07 +08:00
winlin	68d835021e	refine code, move the kbps to protocol	2015-05-23 09:58:00 +08:00

Renamed from trunk/src/app/srs_app_kbps.hpp (Browse further)