33 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	ca43bfe6d9	Fix build failed, for srs librtmp API changed.	2017-02-28 14:54:53 +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	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	f1e7e9d933	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
winlin	f516636448	refine code for hooks and http core.	2015-12-29 18:33:02 +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	bbac2348db	for #354, remove the double underscore functions and variables.	2015-03-21 11:55:28 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	d171a26758	disable gop cache when not h.264. fix some warning.	2014-12-01 21:34:35 +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	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	5554922820	refine librtmp tools, use srs_trace macro instead printf.	2014-11-08 14:06:40 +08:00
winlin	cf5c24af4a	refine librtmp, unify all tools format and usage.	2014-11-08 14:00:59 +08:00
winlin	aad42d7941	fix ubuntu14 build warnings	2014-06-29 00:09:55 +08:00
winlin	55b99c90c7	refine detect tool, support atc stream.	2014-06-11 14:16:44 +08:00
winlin	cccc483ab3	add bytes statistic for librtmp	2014-06-10 17:39:12 +08:00
winlin	a639eb0596	fix bug of buffer assert, erase can accept any value	2014-06-10 16:06:18 +08:00
winlin	d48d739fa7	fix bug of detect rtmp, add error code	2014-06-10 11:57:46 +08:00
winlin	4d9ed6f7fe	refine the code, add comments to result to self interpret	2014-06-10 11:44:02 +08:00
winlin	8817823462	add rtmp detecter	2014-06-10 11:34:35 +08:00
winlin	ef6efb821c	add rtmp detecter	2014-06-10 10:40:31 +08:00