3916 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	977f82ad1d	refine the content	2017-01-04 11:46:22 +08:00
winlin	6cf7089bae	refine the content	2017-01-04 11:45:45 +08:00
winlin	9b85d9fca5	refine the content	2017-01-04 11:45:22 +08:00
winlin	412f6f3b47	refine the content	2017-01-04 11:42:56 +08:00
winlin	85ceea1c98	refine the content	2017-01-04 11:34:59 +08:00
winlin	e292d4fdcc	update to 2017	2016-12-16 12:49:48 +08:00
winlin	7ac932cfa0	update to 2013-2017	2016-12-16 11:57:25 +08:00
winlin	b231550c32	fix #717, #691, http api/static/stream support cors. 3.0.9	2016-12-15 16:22:04 +08:00
winlin	f6661989af	fix typo for #513, #691	2016-12-15 15:00:08 +08:00
winlin	664844b5f5	merge from srs2. for #513.	2016-12-15 14:54:09 +08:00
winlin	f30b3073a2	refine the cros of api for flv	2016-12-15 14:10:02 +08:00
winlin	3df8f11884	refine thread stop	2016-12-14 18:21:50 +08:00
winlin	fd693915c3	Merge branch '2.0release' into develop	2016-12-13 19:14:36 +08:00
winlin	34e5cdcd12	update latest srs2	2016-12-13 19:14:30 +08:00
winlin	c8aa34f0be	merge srs2	2016-12-13 19:08:09 +08:00
winlin	6d3184029a	release v2.0b3 2.0.223	2016-12-13 19:07:22 +08:00
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	5a76f15e4e	fix typo and refine grammar. 3.0.7	2016-12-07 14:43:14 +08:00
winlin	cda9beeba7	refine comments	2016-12-07 14:40:25 +08:00
winlin	d194691c09	refine comments	2016-12-07 14:37:28 +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	625ca23739	release r2.0b2, 2.0.221	2016-11-09 09:43:51 +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
winlin	b007350371	Merge pull request #392 from SnailTowardThesun/2.0release ... fix the bug: when trying to push same stream more than twice, to play…	2016-10-26 09:50:00 +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	7deda9370c	Merge branch '2.0release' into develop	2016-09-27 14:55:07 +08:00