3835 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	8a4e241eec	merge from srs2	2016-09-09 14:29:33 +08:00
winlin	6c4c68ccb6	2.0 beta1(2.0.215) released.	2016-09-09 14:26:16 +08:00
winlin	49b880d4ce	refine comments	2016-09-09 14:18:50 +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	09895fcfc2	Merge branch '2.0release' into develop	2016-09-09 11:03:39 +08:00
winlin	4fe1eca09c	Merge pull request #638 from m13253/2.0release ... Flush the stdout buffer after logging to console	2016-09-09 11:02:52 +08:00
winlin	4342d3ed18	Merge branch '2.0release' into develop	2016-09-09 10:59:24 +08:00
winlin	5cd5ee73cd	refine tags	2016-09-09 10:59:20 +08:00
Star Brilliant	a164c90e28	Flush the stdout buffer after logging to console ... Normally if the stdout is connected to a PTY, the stdout buffer is flushed automatically after each \n. However if I run SRS under Docker, the stdout is not connected to a PTY (unless I ask it to), causing the last log line to be incomplete (showing only half). By adding fflush, we could make sure each log line is completely shown, whenever the stdout is connected to a PTY or not.	2016-09-08 07:58:52 -05:00
winlin	17df61724d	Merge branch '2.0release' into develop	2016-09-08 19:56:17 +08:00
winlin	7aaa74b9e0	TODO: FIXME: for librtmp, must group NALUs to frame.	2016-09-08 19:56:06 +08:00
winlin	2cf077abe9	Merge branch '2.0release' into develop	2016-09-08 18:55:40 +08:00
winlin	80a98cf836	refine annexb parse	2016-09-08 18:55:35 +08:00
winlin	b24d1de377	Merge branch '2.0release' into develop	2016-09-05 14:56:41 +08:00
winlin	590e951739	fix memory leak of source.	2016-09-05 14:56:31 +08:00
winlin	0e9318e5d8	merge from 2.0	2016-09-05 14:16:24 +08:00
winlin	c7b97aa1c3	fix memory leak at source. 2.0.214	2016-09-05 14:13:37 +08:00
winlin	815f2491a4	merge from 2.0	2016-09-05 09:39:20 +08:00
winlin	6ec60b0a21	fix memory leak at handshake. 2.0.213	2016-09-05 09:38:30 +08:00
winlin	39a46f7b97	Merge branch '2.0release' into develop	2016-09-03 23:11:58 +08:00
winlin	1214af643e	refine comments for arm	2016-09-03 23:11:51 +08:00
winlin	c0498c82ee	merge 2.0	2016-09-03 18:48:19 +08:00
winlin	e775eb3ff2	support all arm for patched st. 2.0.212	2016-09-03 18:47:46 +08:00
winlin	8ad7da1cb6	merge from 2.0	2016-09-02 15:25:20 +08:00
winlin	958e20a5a2	Merge pull request #330 from xubin11235/2.0release ... 修复forward崩溃	2016-09-02 15:22:06 +08:00
xubin	49853d2b8a	修复forward崩溃	2016-09-02 15:10:43 +08:00
winlin	7933b6abd2	update readme	2016-09-01 17:11:18 +08:00
winlin	ce6f4bfbe0	refine readme	2016-09-01 17:07:54 +08:00
winlin	6696782d56	refine readme	2016-09-01 17:07:07 +08:00
winlin	861d845f54	refine readme	2016-09-01 17:05:43 +08:00
winlin	7d96a33207	Merge branch '2.0release' into develop	2016-09-01 16:51:18 +08:00
winlin	e2865c6ac1	workaround for #511, the fly stfd in close. 2.0.211	2016-09-01 16:51:09 +08:00
winlin	b49cb3d379	Merge branch '2.0release' into develop	2016-08-30 19:30:05 +08:00
winlin	a0890fe06a	comment the pcr	2016-08-30 19:29:59 +08:00
winlin	5d5fa7204d	Merge branch '2.0release' into develop	2016-08-18 12:22:30 +08:00
winlin	d919668b61	don't ignore aud	2016-08-18 12:22:04 +08:00
winlin	bf22acd689	Merge branch '2.0release' into develop	2016-08-18 11:29:22 +08:00
winlin	f080537887	update readme	2016-08-18 11:28:54 +08:00
winlin	a4bb03b9d6	ignore other 264 frame except sps,pps,idr,nonidr	2016-08-18 11:27:11 +08:00
winlin	7df7156e07	Merge branch '2.0release' into develop	2016-08-17 10:12:34 +08:00
winlin	dbc6d94028	update readme.	2016-08-17 09:33:11 +08:00
winlin	31a1b7bed2	Merge branch '2.0release' into develop	2016-08-10 22:30:05 +08:00
winlin	304ff02aef	default to 30s timeout for librtmp	2016-08-10 22:29:56 +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