30 commits

Author	SHA1	Message	Date
winlin	82457cda4b	Change date from 2017 to 2018	2018-01-07 11:00:58 +08:00
winlin	0a57a46016	Refine LICENSE	2017-03-25 21:29:29 +08:00
winlin	f32aab3d92	For #299, refine code.	2017-03-25 17:21:39 +08:00
winlin	72c4ae4a8c	Refine srs-librtmp API, change print to format	2017-03-01 10:52:57 +08:00
winlin	68a5407b3a	Remove using of connect_app2.	2017-02-28 20:35:56 +08:00
winlin	34a8eb6113	for #738, add srs ingest mp4 tool	2017-01-31 20:43:48 +08:00
winlin	b16ab038ce	for #742, refine the u_intxx_t to uintxx_t	2017-01-30 17:32:18 +08:00
winlin	c5fcc15989	update the date info	2017-01-18 16:41:47 +08:00
winlin	f8358da316	refine ingester log.	2016-01-13 16:20:05 +08:00
winlin	49308dddfb	update 2015 to 2016	2015-12-23 11:41:41 +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	bd77f995bf	ignore the unknown flv tag.	2015-04-09 12:35:17 +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	aa69f6197a	srs-librtmp add rtmp prefix for rtmp apis. 2.0.29	2014-11-21 14:18:50 +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	7ebca6cb5b	refine the type of RTMP from int to char. add srs_parse_timestamp(), 2.0.19	2014-11-15 13:20:58 +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	aad42d7941	fix ubuntu14 build warnings	2014-06-29 00:09:55 +08:00
winlin	e3be7bfa88	disable detail log	2014-04-30 12:22:06 +08:00
winlin	30bb3ff704	add dvr_plan hss to full.conf	2014-04-30 11:56:19 +08:00
winlin	c530a8e5fc	fix bug of ingest for android, init the variable to 0	2014-04-19 12:47:16 +08:00
winlin	b1835ee2fe	add ingest flv to RTMP over srs-librtmp	2014-04-19 11:19:26 +08:00
winlin	f17f5de7d1	ingest rtmp to rtmp by srs-librtmp	2014-04-19 10:30:40 +08:00
winlin	608b28f223	add srs ingest flv/rtmp base on srs-librtmp	2014-04-19 09:47:47 +08:00