2226 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	3553a18c86	Merge branch 'srs.master'	2014-11-18 16:32:30 +08:00
winlin	1bf32a15e1	refs #1670: update readme, SRS1.0/2.0 supports 500 clients to publish streams.	2014-11-18 16:31:26 +08:00
winlin	ad6e838d5d	Merge branch 'srs.1.0release' into 1.0release	2014-11-18 13:43:44 +08:00
winlin	a0ed9bcb24	Merge branch 'srs.master'	2014-11-18 13:43:35 +08:00
winlin	c1e9aed0ac	all wiki translated to English. 1.0.7	2014-11-18 13:41:36 +08:00
winlin	fbcb63f775	v2.0, 2014-11-18, all wiki translated to English. 2.0.23.	2014-11-18 13:40:58 +08:00
winlin	dc1c78ef33	Merge branch 'srs.1.0release' into 1.0release	2014-11-17 10:28:26 +08:00
winlin	fd37d2396b	Merge branch 'srs.master'	2014-11-17 10:28:18 +08:00
winlin	9f60a6738a	add comments for listen	2014-11-17 10:27:05 +08:00
winlin	520764fba3	update readme, add qq group.	2014-11-16 21:11:49 +08:00
winlin	a7faf54567	update readme, add qq group.	2014-11-16 21:11:10 +08:00
winlin	7f987bb2a0	update readme, add qq group.	2014-11-16 21:08:36 +08:00
winlin	ba5b3b92b1	update readme, add qq group.	2014-11-16 21:08:06 +08:00
winlin	d7265a342f	Merge branch 'srs.1.0release' into 1.0release	2014-11-16 12:11:36 +08:00
winlin	2599165f90	update 1.0release readme, remove the unstable features.	2014-11-16 12:11:11 +08:00
winlin	5557160ead	Merge branch 'srs.master'	2014-11-16 11:30:32 +08:00
winlin	0c39a704c2	update build srs librtmp single	2014-11-16 11:29:50 +08:00
winlin	dc0757f1e9	Merge branch 'srs.1.0release' into 1.0release	2014-11-15 21:30:40 +08:00
winlin	f2cb46d2d6	Merge branch 'srs.master'	2014-11-15 21:30:37 +08:00
winlin	c3986d9d6d	update readme for wiki	2014-11-15 21:25:18 +08:00
winlin	8878367505	update readme for wiki	2014-11-15 21:24:47 +08:00
winlin	64a1d975d7	update readme for wiki	2014-11-15 21:16:11 +08:00
winlin	3f9e11ea83	update readme for wiki	2014-11-15 21:13:24 +08:00
winlin	68a09d5b5c	update readme for wiki	2014-11-15 20:10:48 +08:00
winlin	499c248258	Merge branch 'srs.master'	2014-11-15 20:09:35 +08:00
winlin	3247121619	update readme for wiki	2014-11-15 20:09:05 +08:00
winlin	46c7a669be	Merge branch 'srs.master'	2014-11-15 20:08:53 +08:00
winlin	81b0f246f5	update readme for wiki	2014-11-15 20:08:19 +08:00
winlin	b924620922	Merge branch 'srs.master'	2014-11-15 20:04:28 +08:00
winlin	55d4c71362	update readme for wiki	2014-11-15 20:03:55 +08:00
winlin	273ba9c2e5	update readme for wiki	2014-11-15 19:54:00 +08:00
winlin	9b97127c39	Merge branch 'srs.master'	2014-11-15 19:50:26 +08:00
winlin	dca060dcde	update readme for wiki	2014-11-15 19:50:02 +08:00
winlin	7a703c7439	Merge branch 'srs.master'	2014-11-15 17:13:30 +08:00
winlin	e70e864e5d	add h264 stream publish usage.	2014-11-15 17:13:09 +08:00
winlin	e183286fb8	Merge branch 'srs.master'	2014-11-15 17:00:00 +08:00
winlin	fed87b3986	update readme, typo	2014-11-15 16:59:41 +08:00
winlin	fa9f60eb3d	Merge branch 'srs.master'	2014-11-15 16:53:45 +08:00
winlin	2c601a0069	fix #204, srs-librtmp drop dupliated sps/pps(sequence header). 2.0.22.	2014-11-15 16:53:24 +08:00
winlin	b4269c8d67	refine name of srslibrtmp, raw_stream to h264_raw_stream	2014-11-15 16:31:42 +08:00
winlin	5912c6252b	Merge branch 'srs.master'	2014-11-15 16:30:57 +08:00
winlin	278ff845d3	fix #203, srs-librtmp drop any video before sps/pps(sequence header). 2.0.21.	2014-11-15 16:30:37 +08:00
winlin	ecfbcd68d8	refine srslibrtmp, rename flv_bool to srs_flv_bool	2014-11-15 16:07:33 +08:00
winlin	a99b79fd95	Merge branch 'srs.master'	2014-11-15 15:28:14 +08:00
winlin	3292136f70	update research, flv ingester, support atc time flv.	2014-11-15 15:27:19 +08:00
winlin	65dd0f1659	Merge branch 'srs.master'	2014-11-15 14:37:17 +08:00
winlin	30d48905b3	refine git sync script, checkout master	2014-11-15 14:34:23 +08:00
winlin	daed6fe193	Merge branch 'srs.master'	2014-11-15 14:29:42 +08:00
winlin	bb5e99f562	fix #202, fix memory leak of h.264 raw packet send in srs-librtmp. 2.0.20.	2014-11-15 14:29:25 +08:00
winlin	c67e8b6862	Merge branch 'srs.master'	2014-11-15 13:21:50 +08:00