2624 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	118efcbbf8	update the file for 1.0rc1.	2015-01-15 11:38:03 +08:00
winlin	8e2b871829	update readme for 1.0rc1	2015-01-15 11:33:24 +08:00
winlin	98fb50464a	update readme for 1.0r1, 1.0.21	2015-01-15 11:31:07 +08:00
winlin	a4b61081cc	merge from feilong, fix memory leak.	2015-01-15 11:26:30 +08:00
winlin	ad5956eab4	update readme	2015-01-15 11:24:35 +08:00
winlin	bb74c8dfc5	update readme for 1.0r1	2015-01-15 11:24:00 +08:00
winlin	fae006ca7c	merge from feilong, fix memory leak.	2015-01-15 10:41:20 +08:00
winlin	df3b5c953b	update donation link to develop	2015-01-15 09:18:48 +08:00
winlin	1316dab83c	update donation link to develop	2015-01-15 09:17:35 +08:00
winlin	63309a0538	refine for bug #288, drop info frame without error.	2015-01-14 11:55:15 +08:00
winlin	b705ed0b90	for bug #288, refine the codec decode info frame failed. 1.0.21	2015-01-14 11:32:19 +08:00
winlin	964668dc73	merge from feilong, print format error.	2015-01-14 11:20:21 +08:00
winlin	61752bec08	update donation	2015-01-09 16:31:15 +08:00
winlin	b3225100e7	Merge pull request #282 from tufang14/develop ... add client num in statistic with traverse every client for #227	2015-01-09 09:00:08 +08:00
qiang.li	310e49e7f3	add client num in statistic with traverse every client	2015-01-08 21:58:10 +08:00
winlin	b1187b8c66	update readme	2015-01-08 19:04:19 +08:00
winlin	c80477d58e	update readme.	2015-01-08 19:03:41 +08:00
winlin	982e9555bd	merge from feilong, fix hls msg memory leak bug.	2015-01-08 17:48:45 +08:00
winlin	b466756931	merge from feilong for bug #281.	2015-01-08 17:44:08 +08:00
winlin	27e0521ace	fix #281, fix hls bug ignore type-9 send aud. 1.0.20	2015-01-08 17:37:28 +08:00
winlin	6c833902f9	merge http api from tufang. 2.0.92	2015-01-08 16:02:33 +08:00
winlin	ac584a4db2	Merge pull request #279 from tufang14/develop ... add client num for stream in statistic for #227	2015-01-08 15:52:44 +08:00
qiang.li	46d716612c	add client num for stream in statistic	2015-01-07 23:27:24 +08:00
winlin	44f5efda21	refine the print info.	2015-01-07 15:46:00 +08:00
winlin	0e9c9db3f4	fix the aggregate bug, adjust to starttime of msg. 2.0.91	2015-01-07 15:37:44 +08:00
winlin	5aa31568ba	fix the rtmp dump, parse the aggregate msg.	2015-01-07 15:35:01 +08:00
winlin	5661fc2676	refine dvr and rtmp dump, write the original data.	2015-01-07 15:01:58 +08:00
winlin	a402ca7120	refine code, the consumer always alive longer than queue recv thread.	2015-01-07 14:31:42 +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
qiang.li	08e9f6ef42	add play client num in statistic	2015-01-06 22:20:31 +08:00
tufang14	532a48409d	Merge pull request #1 from winlinvip/develop ... merge origin	2015-01-05 14:02:29 +08:00
winlin	4c18234678	Merge branch 'tufang14-develop' into develop	2015-01-05 13:08:23 +08:00
winlin	f1efdcd000	refine code, use global virtual id to generate the id of vhost and stream.	2015-01-05 13:08:11 +08:00
winlin	ae63af6a4a	refine code, implements the stat.:	2015-01-05 12:57:48 +08:00
winlin	97bea51499	refine the api, response the error code and data.	2015-01-05 12:49:00 +08:00
winlin	cc796a433a	refine the statistic arch.	2015-01-05 12:40:38 +08:00
winlin	40ed2249e8	refine code to use the one coding style.	2015-01-05 12:20:46 +08:00
winlin	4bb17f0c81	replace the TAB with 4spaces	2015-01-05 12:14:02 +08:00
winlin	344ff24f66	add srs_app_statistic to upp project.	2015-01-05 12:12:21 +08:00
winlin	67adc8dc61	merge with security bug fix.	2015-01-05 12:09:15 +08:00
qiang.li	a4a93613d0	add statistic for stream	2015-01-04 22:47:12 +08:00
winlin	32657b0a50	update readme	2015-01-04 16:37:33 +08:00
winlin	2ea1c4fb61	update readme for security	2015-01-03 22:31:10 +08:00
winlin	dc11418c79	fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89	2015-01-03 15:33:23 +08:00
winlin	dd2c7e0b4d	hotfix to remove the pageUrl for http callback. 2.0.88	2015-01-03 15:08:46 +08:00
winlin	247b772449	hotfix to remove the pageUrl for http callback. 1.0.19	2015-01-03 15:07:12 +08:00
winlin	7f60d472e6	remove the change vhost forward.	2015-01-03 14:47:19 +08:00
winlin	45724bfaec	update conf for transcode.	2015-01-03 14:46:29 +08:00
winlin	0b9bbdbe74	Merge branch '1.0release' into develop	2015-01-03 13:30:13 +08:00