2926 commits

Author	SHA1	Message	Date
winlin	09895fcfc2	Merge branch '2.0release' into develop	2016-09-09 11:03:39 +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
xubin	49853d2b8a	修复forward崩溃	2016-09-02 15:10: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	a4bb03b9d6	ignore other 264 frame except sps,pps,idr,nonidr	2016-08-18 11:27: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
winlin	516f33888c	refine config	2016-08-09 12:37:48 +08:00
winlin	36eb0981ec	merge from 2.0release	2016-08-08 14:09:10 +08:00
intliang	3fbe9d2442	fixed crash by improper srs_info use.	2016-08-08 14:07:19 +08:00
winlin	f87646d489	fix typo of config.	2016-08-08 13:58:42 +08:00
winlin	abeb4f46a9	merge 2.0	2016-08-06 17:28:43 +08:00
winlin	ec6e77992e	2.0.210	2016-08-06 16:38:18 +08:00
winlin	499fc07db1	refine the hls m3u8 refresh interval.	2016-08-02 16:52:23 +08:00
winlin	5fa500646e	update srs player version	2016-08-02 16:37:52 +08:00
winlin	ec57e2170d	refine hls m3u8 refresh interval and buffer time	2016-08-02 16:31:59 +08:00
winlin	b463e4a2f4	Merge branch '2.0release' into develop	2016-05-17 10:54:34 +08:00
weiyabo	8df7135dee	for bug #5064, success parse 264 sps	2016-05-17 10:53:56 +08:00
winlin	c746753c6a	update player, add pst(player startup time)	2016-04-22 13:33:29 +08:00
winlin	892591f9a6	merge from @mbeacom	2016-04-22 10:18:13 +08:00
winlin	2e75c9f45f	add more buffer	2016-04-19 18:15:47 +08:00
winlin	9312d77c20	default not to preview the stream for publisher.	2016-04-12 11:32:13 +08:00
winlin	6b5c880ff9	refine player to support status change.	2016-03-22 18:35:44 +08:00
winlin	4841435b14	fix default http port bug.	2016-03-19 22:45:39 +08:00
winlin	a2d235f015	refresh js cache.	2016-03-19 22:14:56 +08:00