3276 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	44bc7976ac	merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.	2015-05-19 18:06:20 +08:00
winlin	0f7cafe50b	order the xcode project	2015-05-15 14:34:59 +08:00
winlin	f6d2fd991b	merge from 2.0.162	2015-05-10 10:36:49 +08:00
winlin	c617d2aaa5	support push flv stream over HTTP POST to SRS.	2015-05-10 10:35:35 +08:00
winlin	39f5f80b6c	Merge branch '2.0release' into develop	2015-05-09 23:12:23 +08:00
winlin	77ee2400df	fix the unicode to ascii	2015-05-09 23:12:12 +08:00
winlin	1fd69beea5	Merge branch '2.0release' into develop	2015-05-08 16:45:48 +08:00
winlin	7fc1cda392	add stream status to api.	2015-05-08 16:45:25 +08:00
winlin	7ce9398b41	Merge branch '2.0release' into develop	2015-05-08 07:04:36 +08:00
winlin	ac13817aae	update donation	2015-05-08 07:04:31 +08:00
winlin	60e10f2960	Merge branch '2.0release' into develop	2015-05-07 11:48:50 +08:00
winlin	0fd23c85cc	update donation	2015-05-07 11:48:36 +08:00
winlin	2d61a8cfaf	Merge branch '2.0release' into develop	2015-05-07 11:07:42 +08:00
winlin	f6252c7f72	enable hls for push flv.	2015-05-07 11:07:32 +08:00
winlin	99e4bad56f	update donation.	2015-05-06 22:04:47 +08:00
winlin	644454a4f5	Merge branch '2.0release' into develop	2015-05-05 11:46:28 +08:00
winlin	ffdabf32ed	add push flv conf	2015-05-05 11:44:20 +08:00
winlin	f13c4d3a0f	Merge branch '2.0release' into develop	2015-05-05 07:37:20 +08:00
winlin	e221d002a2	fix the flv caster bug, when nread is 0, disconnect it.	2015-05-05 07:37:12 +08:00
winlin	e516c7f7a5	Merge branch '2.0release' into develop	2015-05-04 21:55:28 +08:00
winlin	ad32048c1c	fix the http flv stream caster.	2015-05-04 21:55:19 +08:00
winlin	cba6675560	refine the http message, set the connection if required.	2015-05-04 19:06:38 +08:00
winlin	ba6c3132e3	refine code, use decoder to parse flv stream	2015-05-04 18:28:41 +08:00
winlin	411f5a1d2a	Merge branch '2.0release' into develop	2015-05-04 18:12:00 +08:00
winlin	ea1e015a4e	fix the http read chunked encoding bug.	2015-05-04 18:11:52 +08:00
winlin	da00b67c76	Merge branch '2.0release' into develop	2015-05-03 23:57:32 +08:00
winlin	a95fd6d140	read the http flv stream.	2015-05-03 23:57:22 +08:00
winlin	022b6aa561	refine the http remux for http flv stream.	2015-05-03 23:34:59 +08:00
winlin	f0c24eeacc	add stream caster for post flv over http.	2015-05-03 10:56:20 +08:00
winlin	f15e9f5b62	Merge branch '2.0release' into develop	2015-04-30 13:42:53 +08:00
winlin	4d18073dab	update contact add skype.	2015-04-30 13:42:30 +08:00
winlin	91e285b0cd	Merge branch '2.0release' into develop	2015-04-29 18:46:54 +08:00
winlin	4b372d8d16	change primary to the primary branch.	2015-04-29 18:46:47 +08:00
winlin	94681702e1	Merge branch '2.0release' into develop	2015-04-29 18:03:20 +08:00
winlin	e63b8eda51	migarate to srs org.	2015-04-29 18:03:17 +08:00
winlin	42ddb76544	Merge branch '2.0release' into develop	2015-04-29 18:01:24 +08:00
winlin	8603dba697	migarate to srs org.	2015-04-29 18:01:16 +08:00
winlin	5819614ff0	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:49:42 +08:00
winlin	fff838e4c1	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:48:52 +08:00
winlin	17b15deee6	Merge branch '2.0release' into develop	2015-04-29 17:38:29 +08:00
winlin	b23e196f20	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:38:23 +08:00
winlin	9189a408c1	Merge branch '2.0release' into develop	2015-04-29 17:28:23 +08:00
winlin	90b80ffc45	migarate from winlinvip to srs org.	2015-04-29 17:28:15 +08:00
winlin	53e92a17f5	Merge branch '2.0release' into develop	2015-04-29 17:06:40 +08:00
winlin	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
winlin	5559fb9842	Merge branch '2.0release' into develop	2015-04-29 15:44:53 +08:00
winlin	b3bd007f0d	update git commit	2015-04-29 15:09:03 +08:00
winlin	fc21986695	Merge branch '2.0release' of github.com:winlinvip/simple-rtmp-server into 2.0release	2015-04-29 09:25:25 +08:00
winlin	ae6d0a5ab1	Merge branch '2.0release' into develop	2015-04-29 09:25:08 +08:00
winlin	24739a409f	update donation for wangguanghui.	2015-04-29 09:24:56 +08:00