31 commits

Author	SHA1	Message	Date
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	be342178c0	fix ingest flv tool, support non monotonically timestamp.	2015-07-13 22:09:01 +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	23b978c0bb	merge from github	2015-04-20 11:28:46 +08:00
winlin	8fbc6526bb	for #383, refine code to support mix correct algorithm.	2015-04-15 16:17:52 +08:00
winlin	a739b2c555	fix the bug for fork ffmpeg in mac, the local variable is unvailable.	2015-03-11 15:54:31 +08:00
winlin	f247ac9daf	fix the http parse bug.	2015-03-11 14:48:51 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	d80b580c2f	refine librtmp, remove the _get_ for some attribute get.	2014-11-21 16:08:29 +08:00
winlin	aa69f6197a	srs-librtmp add rtmp prefix for rtmp apis. 2.0.29	2014-11-21 14:18:50 +08:00
winlin	10bc5399ec	refine librtmp api, add prefix utils for utilities.	2014-11-21 14:09:17 +08:00
winlin	b3bb2cdf2b	refine code, rename the human functions to prefixed with srs_human_	2014-11-21 14:03:30 +08:00
winlin	d9474d7600	refine examples of srs-librtmp, add srs_print_rtmp_packet. 2.0.28.	2014-11-21 13:48:57 +08:00
winlin	3292136f70	update research, flv ingester, support atc time flv.	2014-11-15 15:27:19 +08:00
winlin	606fc13a03	rename the confict macro to srs_lib_trace	2014-11-08 18:37:15 +08:00
winlin	cf5c24af4a	refine librtmp, unify all tools format and usage.	2014-11-08 14:00:59 +08:00
winlin	f92303c764	refine all research tools, remove the public header, add log to srs_librtmp.h	2014-11-08 13:35:38 +08:00
winlin	a888e52df1	donot mix the read and write for librtmp	2014-06-29 17:17:50 +08:00
winlin	1a7735182f	refine the file stream, to file reader and writer. 0.9.142	2014-06-29 17:05:26 +08:00
winlin	aad42d7941	fix ubuntu14 build warnings	2014-06-29 00:09:55 +08:00
winlin	22968c85df	supprt inject flv	2014-05-28 19:01:47 +08:00
winlin	f37faf7236	update librtmp, add amf0 parse functions	2014-05-21 18:30:58 +08:00
winlin	2a8db3ab83	refine the re of ingest flv, re cleanup always sleep	2014-05-21 09:31:38 +08:00
winlin	1d6b096ce9	adjust the deviation.	2014-05-20 18:15:02 +08:00
winlin	2265173c4d	donot install tools when ffmpeg is not open, 0.9.108	2014-05-20 18:11:33 +08:00
winlin	4c5aae7804	fix bug of ingest for android, init the variable to 0	2014-04-19 12:49:15 +08:00
winlin	5c8aad4fe4	fix bug of ingest for android, init the variable to 0	2014-04-19 12:49:05 +08:00
winlin	c530a8e5fc	fix bug of ingest for android, init the variable to 0	2014-04-19 12:47:16 +08:00
winlin	e5fcf80b94	refine ingest flv over srs-librtmp	2014-04-19 11:24:31 +08:00
winlin	b1835ee2fe	add ingest flv to RTMP over srs-librtmp	2014-04-19 11:19:26 +08:00
winlin	608b28f223	add srs ingest flv/rtmp base on srs-librtmp	2014-04-19 09:47:47 +08:00