2894 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	5d7c24de48	update readme	2015-03-15 14:18:05 +08:00
winlin	a21243ea12	merge from 2.0	2015-03-15 08:16:37 +08:00
winlin	d349a3dbda	update stable version check	2015-03-15 08:15:04 +08:00
winlin	519c25a064	fork srs2 and start srs3. 3.0.0	2015-03-15 08:06:41 +08:00
winlin	636bc574af	start 2.0release, 80773 lines.	2015-03-15 07:48:27 +08:00
winlin	5e19f5f2b8	add qq and weixin image.	2015-03-14 22:14:04 +08:00
winlin	e6058c1560	update donation	2015-03-14 20:25:21 +08:00
winlin	320f45c6f4	fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140.	2015-03-14 20:07:56 +08:00
winlin	27cb62b7aa	for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.	2015-03-14 19:45:13 +08:00
winlin	995b130090	for #324, refine code for hstrs, support hijack handler.	2015-03-14 14:55:45 +08:00
winlin	5c6ef6ded6	fix warning for xcode.	2015-03-14 13:09:34 +08:00
winlin	6d15d0ea99	for #324, refine code, add hstrs config.	2015-03-14 09:52:47 +08:00
winlin	2adc069df0	update readme for why srs	2015-03-13 18:07:43 +08:00
winlin	74fa3ba16f	fix build failed for linux.	2015-03-13 17:34:33 +08:00
winlin	a15ce1147f	for #155, fix all warnings for mac.	2015-03-13 12:53:01 +08:00
winlin	51967afb52	Merge pull request #330 from wenjiegit/develop ... HDS support reload，for #328	2015-03-13 07:46:12 +08:00
wenjie.zhao	65f404fb42	for #340, refine ts prefix code.	2015-03-13 02:01:24 +08:00
wenjie.zhao	5969f72354	for #340, refine ts prefix code.	2015-03-13 01:32:51 +08:00
wenjie.zhao	10da182853	add hls prefix of uri supported	2015-03-13 00:22:55 +08:00
wenjie.zhao	efe3050d7a	fix hls muxer Segmentation fault.	2015-03-12 23:50:21 +08:00
wenjie.zhao	73f13dfc42	fix hls muxer Segmentation fault.	2015-03-12 23:39:44 +08:00
wenjie.zhao	643f18abe4	add hds reload supported.#328	2015-03-12 22:38:11 +08:00
wenjie.zhao	abe0713980	Merge pull request #2 from winlinvip/develop ... Develop	2015-03-12 15:11:32 +08:00
winlin	984145de72	for #328, add todo for hds, check whether disabled, support reload.	2015-03-12 11:52:35 +08:00
winlin	5d12a1ab20	for #328, add hds specification.	2015-03-12 11:36:12 +08:00
winlin	ffef62900f	for #328, support adobe hds. 2.0.138.	2015-03-12 11:15:15 +08:00
winlin	da56e4fbb9	for #328, fix hds compile error on mac.	2015-03-12 07:26:30 +08:00
winlin	03bcfd9960	Merge pull request #327 from wenjiegit/develop ... for #328, add hds supported.	2015-03-12 07:12:17 +08:00
winlin	a739b2c555	fix the bug for fork ffmpeg in mac, the local variable is unvailable.	2015-03-11 15:54:31 +08:00
winlin	3e5821efff	enable http api for x86_x64	2015-03-11 15:04:34 +08:00
winlin	3732554844	remove the xcode state.	2015-03-11 14:56:03 +08:00
winlin	1ad0c847ce	fix http parse bug	2015-03-11 14:55:46 +08:00
winlin	f247ac9daf	fix the http parse bug.	2015-03-11 14:48:51 +08:00
wenjie.zhao	07d8f060eb	refine annotation	2015-03-11 14:36:28 +08:00
wenjie.zhao	570c0d66bd	fix path issue.	2015-03-11 14:34:00 +08:00
wenjie.zhao	066158de61	Merge branch 'winlinvip-develop' into develop	2015-03-11 14:19:35 +08:00
wenjie.zhao	e57bda8908	Merge code. ... Conflicts: trunk/configure trunk/src/app/srs_app_source.cpp trunk/src/kernel/srs_kernel_error.hpp	2015-03-11 14:18:09 +08:00
wenjie.zhao	d4198ee8ba	add hds supported.	2015-03-11 13:34:58 +08:00
winlin	5370493140	add ingest to mac.dev conf.	2015-03-11 13:24:14 +08:00
winlin	74d6f27519	update donation, add yefayang.	2015-03-11 11:39:43 +08:00
winlin	24616e15b5	remove the code for xcode, not required.	2015-03-10 18:33:32 +08:00
winlin	b3aed2cb59	fix the bug of configure.	2015-03-10 18:18:47 +08:00
winlin	f9767c91b5	fix configure bug, refine code for stream caster.	2015-03-10 18:07:43 +08:00
winlin	6c11207e28	fix http ts bug, the adts use id=1 which indicates the aac encoding.	2015-03-10 17:58:29 +08:00
winlin	5c3c38684b	fix the bug of flv stream, metadata type should be 18	2015-03-10 17:04:02 +08:00
winlin	0ff49fd299	for #155, debug srs on xcode.	2015-03-10 13:13:31 +08:00
winlin	db7ddfd510	fix #155, #135, support osx(darwin) for mac pro. 2.0.137.	2015-03-10 12:50:27 +08:00
winlin	20fb5f3e8e	modify the colorful bash for osx.	2015-03-09 23:20:12 +08:00
winlin	b0953c1d3a	add comments of audio profile supported by srs.	2015-03-08 20:02:43 +08:00
winlin	5143e3a58d	fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136	2015-03-08 19:59:10 +08:00