4917 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
winlin	7ebca6cb5b	refine the type of RTMP from int to char. add srs_parse_timestamp(), 2.0.19	2014-11-15 13:20:58 +08:00
winlin	68b0c14592	Merge branch 'srs.master'	2014-11-14 17:34:21 +08:00
winlin	9b2da59eeb	update readme	2014-11-14 17:33:34 +08:00
winlin	b90d32ee8b	Merge branch 'srs.master'	2014-11-14 11:41:13 +08:00
winlin	55d4ce603e	update readme	2014-11-14 11:40:55 +08:00
winlin	050e51ea9b	Merge branch 'srs.master'	2014-11-14 11:25:42 +08:00
winlin	47ed9e33dd	refine code for bug #194, use send messages for all msg array.	2014-11-14 11:24:49 +08:00
winlin	94df80dc39	Merge branch 'srs.master'	2014-11-13 17:31:51 +08:00
winlin	f11272e3ce	add comments for bug #194, #196	2014-11-13 17:29:56 +08:00
winlin	bc597ddb58	Merge branch 'srs.master'	2014-11-13 17:04:51 +08:00
winlin	38a683192a	fix typo	2014-11-13 17:04:13 +08:00
winlin	8a60b3f8f3	Merge branch 'srs.master'	2014-11-13 16:58:16 +08:00