135 commits

Author	SHA1	Message	Date
winlin	733ba73d54	for #738, write mp4 samples.	2017-02-05 09:15:46 +08:00
winlin	253ac40312	for #738, parse avcc/sps/pps/asc from mp4.	2017-02-04 14:57:07 +08:00
winlin	128a1fd3db	for #738, decode mp4 video track boxes.	2017-02-02 15:10:11 +08:00
winlin	b6bb3f2446	fix c99 build failed.	2017-01-31 22:17:27 +08:00
winlin	858951da49	for #738, add srs ingest mp4	2017-01-31 21:36:51 +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	136a7ef488	for #299, refine docs.	2017-01-26 17:28:49 +08:00
winlin	c5fcc15989	update the date info	2017-01-18 16:41:47 +08:00
winlin	0596550a72	Merge branch '2.0release' into develop	2016-09-15 13:31:28 +08:00
winlin	99d87f9f9c	fix sys-ssl librtmp build bug.	2016-09-15 13:17:58 +08:00
winlin	4bcd90d747	fix sys-ssl librtmp build bug.	2016-09-15 13:11:42 +08:00
winlin	c231f45fe8	Merge branch '2.0release' into develop	2016-09-09 14:57:58 +08:00
winlin	bd652e4607	fix build failed for stdc++	2016-09-09 14:41:02 +08:00
winlin	eb915413ad	Merge branch '2.0release' into develop	2016-09-09 14:14:22 +08:00
winlin	0015b303a6	librtmp: refine comment for NALU process.	2016-09-09 14:14:12 +08:00
winlin	93eb961b4c	Merge branch '2.0release' into develop	2016-09-09 11:33:58 +08:00
winlin	4c6c2c28b8	refine h264 raw publish with fps	2016-09-09 11:32: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	f8358da316	refine ingester log.	2016-01-13 16:20:05 +08:00
winlin	f1e7e9d933	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
winlin	9d22d09646	show signature of server.	2016-01-04 17:28:18 +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	170ad05148	add gfps and nb_packets	2015-08-19 15:31:19 +08:00
winlin	e7714cd445	add packets interval in ms to set the right send_min_interval	2015-08-19 15:14:26 +08:00
winlin	ae37fa8f3e	use send_min_interval for stream control. 2.0.183	2015-08-14 11:13:40 +08:00
winlin	be342178c0	fix ingest flv tool, support non monotonically timestamp.	2015-07-13 22:09:01 +08:00
winlin	ac13817aae	update donation	2015-05-08 07:04:31 +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	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	bd77f995bf	ignore the unknown flv tag.	2015-04-09 12:35:17 +08:00
winlin	bbac2348db	for #354, remove the double underscore functions and variables.	2015-03-21 11:55:28 +08:00
winlin	a15ce1147f	for #155, fix all warnings for mac.	2015-03-13 12:53:01 +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	77e43d1813	refine comments of aac publish for #212	2015-01-18 22:11:38 +08:00
winlin	a1f887f46f	refine code, move onMetaData to consts.	2015-01-17 13:29:11 +08:00
winlin	04aa6f8296	drop script data except the onMetaData packet.	2015-01-17 13:23:30 +08:00
winlin	44f5efda21	refine the print info.	2015-01-07 15:46:00 +08:00
winlin	5aa31568ba	fix the rtmp dump, parse the aggregate msg.	2015-01-07 15:35:01 +08:00
winlin	89a3cf9efe	refine code, failed when specified complex but no ssl for srslibrtmp	2015-01-07 13:37:23 +08:00
winlin	0e03d019a8	for bug #215, srs rtmp dump support conn args. 2.0.90	2015-01-07 13:29:30 +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	ff5cdb1cc1	for bug #215, add srs_rtmp_dump tool. 2.0.37.	2014-11-28 12:26:36 +08:00