3526 commits

Author	SHA1	Message	Date
winlin	8935fe8897	merge srs2.	2016-12-13 18:43:22 +08:00
winlin	aca8a79d95	fix #713, disable the source cleanup. 2.0.223	2016-12-13 18:41:45 +08:00
winlin	9ba4bed648	merge srs2	2016-12-13 17:58:42 +08:00
winlin	cb1d47bfef	fix #713, refine source to avoid critical fetch and create. 2.0.222	2016-12-13 17:57:49 +08:00
winlin	439c67018d	remove unused macros.	2016-12-09 15:58:59 +08:00
winlin	2955b1fd2d	support log rotate signal SIGUSR1. 3.0.8	2016-12-08 18:23:22 +08:00
winlin	9e9cad1826	refine messages	2016-12-08 17:55:11 +08:00
winlin	dd1c769f65	refine main	2016-12-08 17:35:33 +08:00
winlin	83c251fc1c	fix bug	2016-12-08 17:29:13 +08:00
winlin	2d387035cd	refine the global variables.	2016-12-08 17:26:04 +08:00
winlin	b06203e777	dispose kafka	2016-12-08 11:48:50 +08:00
winlin	9a3674c624	refine kafka	2016-12-08 11:44:49 +08:00
winlin	28517849ed	refine typo	2016-12-07 12:09:39 +08:00
winlin	f6c8e02cca	Merge branch '2.0release' into develop	2016-11-24 18:12:31 +08:00
ME_Kun_Han	ec4d1b3b4f	fix bug: run srs at startup failed. (#454)	2016-11-24 18:05:43 +08:00
winlin	6dfb44b7b5	Merge branch '2.0release' into develop	2016-11-15 10:43:42 +08:00
winlin	85a7cb884f	fix bug: fix the way calculating PCR for ts(#678) (#430)	2016-11-15 10:42:02 +08:00
hankun	e0ab8b080d	fix bug: fix the way calculating PCR for ts(#678)	2016-11-09 10:14:12 +08:00
winlin	0a8d40925f	merge from 2.0	2016-11-09 09:44:19 +08:00
winlin	d8599a56ca	fix #654, crash when source cleanup for edge. 2.0.221	2016-11-05 10:48:49 +08:00
ME_Kun_Han	f107f404ea	fix bug for issues #654 (#426)	2016-11-05 10:46:24 +08:00
winlin	2f5f7d4a7b	merge srs2	2016-10-26 09:55:24 +08:00
winlin	8b00e56a84	fix #666, crash when source cleanup for http-flv. 2.0.220	2016-10-26 09:54:49 +08:00
winlin	5796e4bf89	merge from srs2	2016-10-26 09:53:27 +08:00
hankun	4f09bcce9f	fix the bug: when trying to push same stream more than twice, to play it through http-flv will cause a core dump(#666)	2016-10-20 10:49:59 +08:00
winlin	112d98ffdb	merge srs2.	2016-10-10 11:56:10 +08:00
winlin	d6fc289c6a	fix #661, close fd after thread stopped. 2.0.219	2016-10-10 11:54:08 +08:00
ME_Kun_Han	7058411cb8	fix the core dump when trying to close srs (#386)	2016-10-10 11:51:49 +08:00
winlin	9cc528cd33	merge srs2	2016-09-23 15:47:17 +08:00
winlin	3659eec9d1	update the cwd	2016-09-23 15:37:51 +08:00
winlin	0e308b0fa1	merge srs2, support oryx	2016-09-23 15:33:43 +08:00
winlin	07fe35f11d	support asprocess for oryx. 2.0.218	2016-09-23 15:17:46 +08:00
winlin	b748fac23a	support asprocess for oryx. 2.0.218	2016-09-23 15:00:50 +08:00
winlin	2a01540433	support change work_dir for oryx.	2016-09-23 14:53:58 +08:00
winlin	b5d466f3d2	update utest	2016-09-15 14:47:42 +08:00
winlin	0fb71281a9	add circleci	2016-09-15 14:28:54 +08:00
winlin	cbffe74494	add circleci	2016-09-15 14:15:49 +08:00
winlin	e15e07c4d1	merge srs2	2016-09-15 13:39:25 +08:00
winlin	ff3f8272a9	fix #640, typo for rtmp type. 2.0.217	2016-09-15 13:37:11 +08:00
winlin	77bca7cc05	Merge branch '2.0release' into develop	2016-09-13 18:08:19 +08:00
winlin	53d2eb5e02	fix librtmp get bytes bug.	2016-09-13 18:08:12 +08:00
winlin	504352d17a	merge srs2.	2016-09-12 18:21:44 +08:00
winlin	c2cb666995	fix fast stream error bug. 2.0.216	2016-09-12 18:21:14 +08:00
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	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