36 commits

Author	SHA1	Message	Date
winlin	4e96c443d8	Change the bool to int for C	2017-02-27 17:39:29 +08:00
winlin	d3bb8b6a86	for #742, refine the io interfaces.	2017-01-30 19:59:59 +08:00
winlin	7acc3aca16	refine hijack io for srslibrtmp	2017-01-18 16:23:59 +08:00
winlin	3fe338d1c5	for #742, use ms for application clock tbn.	2017-01-17 12:25:30 +08:00
winlin	7ac932cfa0	update to 2013-2017	2016-12-16 11:57:25 +08:00
winlin	d68a459198	Merge branch '2.0release' into develop	2016-08-10 22:13:30 +08:00
winlin	02fb0779be	fix the microsec calc bug for librtmp	2016-08-10 22:13:24 +08:00
winlin	14760003ba	merge from 2.0	2016-08-10 22:05:21 +08:00
winlin	e00928557e	fix the timeout for librtmp	2016-08-10 22:04:01 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +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	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	b28dc7364e	refine the srs-librtmp, add hijack get the object.	2014-12-02 14:02:28 +08:00
winlin	a94dbecdc4	refine macro of srs-librtmp. 2.0.43	2014-12-02 13:41:41 +08:00
winlin	9387d09f5f	refine the macros for windows of srs-librtmp	2014-12-02 13:38:30 +08:00
winlin	3584bdb7b6	srs-librtmp support hijack io apis for st-load. 2.0.42.	2014-12-02 12:19:17 +08:00
winlin	7f121efd7a	merge from allspace srs-librtmp for win vs2010. 2.0.36	2014-11-28 10:33:36 +08:00
winlin	03f72fb1a6	for bug #229, revert changes of allspace, for srs-librtmp branch build failed. 2.0.34	2014-11-27 18:39:02 +08:00
winlin	18c308248e	refine code by winlin, for merged from allspace.	2014-11-27 15:22:39 +08:00
winlin	1855c9429c	merge from allspace, to srs-librtmp, for vs2010	2014-11-27 14:46:05 +08:00
winlin	d6072b16c0	support compile srs-librtmp on windows. 2.0.26	2014-11-19 16:16:04 +08:00
winlin	62719c2b12	for bug #200, fix the writev for librtmp, add comments.	2014-11-13 14:38:23 +08:00
winlin	0bc35e093c	for bug #200, deadloop when read/write 0 and ETIME. 2.0.16.	2014-11-13 14:30:56 +08:00
winlin	7b24788445	for bug #143, build on centos5.	2014-08-02 22:18:39 +08:00
winlin	d48d739fa7	fix bug of detect rtmp, add error code	2014-06-10 11:57:46 +08:00
winlin	94cf0c1069	refine kernel buffer. complete the utest for buffer.	2014-06-07 22:23:17 +08:00
winlin	9006194cd7	refine framework to calc the kbps	2014-05-12 17:27:50 +08:00
winlin	644dfa1a6d	fix bug of librtmp	2014-03-26 09:03:57 +08:00
winlin	c85dde7f3f	substitute all TAB with 4spaces.	2014-03-18 11:32:58 +08:00
winlin	76f37baafe	srs-librtmp: implements the simple socket stream.	2014-03-02 13:06:21 +08:00
winlin	86267f854c	srs-librtmp: implements handshake.	2014-03-02 12:35:15 +08:00
winlin	f24f27deb9	srs-librtmp: add make ssl/nossl support for sample	2014-03-02 11:31:31 +08:00
winlin	feaf0c5e89	librtmp: create socket	2014-03-02 09:28:44 +08:00
winlin	f8335e2c1f	extract simple socket to lib	2014-03-02 09:22:09 +08:00