3841 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	31a1b7bed2	Merge branch '2.0release' into develop	2016-08-10 22:30:05 +08:00
winlin	304ff02aef	default to 30s timeout for librtmp	2016-08-10 22:29:56 +08:00
winlin	d68a459198	Merge branch '2.0release' into develop	2016-08-10 22:13:30 +08:00
winlin	02fb0779be	fix the microsec calc bug for librtmp	2016-08-10 22:13:24 +08:00
winlin	14760003ba	merge from 2.0	2016-08-10 22:05:21 +08:00
winlin	e00928557e	fix the timeout for librtmp	2016-08-10 22:04:01 +08:00
winlin	516f33888c	refine config	2016-08-09 12:37:48 +08:00
winlin	36eb0981ec	merge from 2.0release	2016-08-08 14:09:10 +08:00
intliang	3fbe9d2442	fixed crash by improper srs_info use.	2016-08-08 14:07:19 +08:00
winlin	84c2a3c190	merge 2.0release	2016-08-08 13:59:41 +08:00
winlin	f87646d489	fix typo of config.	2016-08-08 13:58:42 +08:00
winlin	abeb4f46a9	merge 2.0	2016-08-06 17:28:43 +08:00
winlin	007f7da50b	release 2.0beta0, 2.0.10	2016-08-06 16:44:33 +08:00
winlin	ec6e77992e	2.0.210	2016-08-06 16:38:18 +08:00
winlin	499fc07db1	refine the hls m3u8 refresh interval.	2016-08-02 16:52:23 +08:00
winlin	5fa500646e	update srs player version	2016-08-02 16:37:52 +08:00
winlin	ec57e2170d	refine hls m3u8 refresh interval and buffer time	2016-08-02 16:31:59 +08:00
winlin	c0c83848a4	update donation	2016-07-17 08:29:06 +08:00
winlin	ceb0187bd1	update readme	2016-05-17 10:58:09 +08:00
winlin	b463e4a2f4	Merge branch '2.0release' into develop	2016-05-17 10:54:34 +08:00
weiyabo	8df7135dee	for bug #5064, success parse 264 sps	2016-05-17 10:53:56 +08:00
winlin	c746753c6a	update player, add pst(player startup time)	2016-04-22 13:33:29 +08:00
winlin	892591f9a6	merge from @mbeacom	2016-04-22 10:18:13 +08:00
winlin	2e75c9f45f	add more buffer	2016-04-19 18:15:47 +08:00
winlin	9312d77c20	default not to preview the stream for publisher.	2016-04-12 11:32:13 +08:00
winlin	6b5c880ff9	refine player to support status change.	2016-03-22 18:35:44 +08:00
winlin	4841435b14	fix default http port bug.	2016-03-19 22:45:39 +08:00
winlin	a2d235f015	refresh js cache.	2016-03-19 22:14:56 +08:00
winlin	d7a28059ed	remove jwplayer and osmf	2016-03-19 22:09:36 +08:00
winlin	d9f1ced732	change srs player to 1.28	2016-03-19 22:00:22 +08:00
winlin	77167f3331	refine srs player for hls, extract a HlsNetStream.	2016-03-19 21:54:46 +08:00
winlin	2492562d25	use xpsid X-Playback-Session-Id to more useful.	2016-03-19 19:48:01 +08:00
winlin	b2bd63e833	refine srs player to play hls.	2016-03-19 19:11:31 +08:00
winlin	46a31f4884	support play hls	2016-03-19 16:35:13 +08:00
winlin	69ec66ee36	refine js for player.	2016-03-19 11:08:25 +08:00
winlin	0a2e00f8c5	dump logs	2016-03-19 10:18:11 +08:00
winlin	9ab5039b36	extract iplayer for srs-player.	2016-03-19 10:06:08 +08:00
winlin	10ce961a00	update version for bwtc	2016-03-14 10:23:20 +08:00
winlin	b3c13f2550	refine the bwtc, to compatible with bms4.	2016-03-12 20:53:37 +08:00
winlin	eed4626c35	use larger limit	2016-03-10 12:28:46 +08:00
winlin	a3038b1274	fix the rtmp url parse bug.	2016-03-10 12:16:51 +08:00
winlin	82aa9d120c	for #5114, display metadata.	2016-03-07 16:02:37 +08:00
winlin	a8ee3162d4	Merge branch '2.0release' into develop	2016-03-03 15:30:38 +08:00
winlin	1df29de19d	update donation	2016-03-03 14:11:33 +08:00
winlin	d72b93e58b	fix the sed bug, to compatible with osx	2016-03-03 10:57:26 +08:00
winlin	00c60db7c3	Merge branch '2.0release' into develop	2016-01-31 22:47:48 +08:00
winlin	a9ed44ccc7	Merge branch 'master' into 2.0release	2016-01-31 22:47:36 +08:00
winlin	f7d9ed5ae4	update api	2016-01-31 21:49:53 +08:00
winlin	6008160ef4	update donation	2016-01-27 14:25:04 +08:00
winlin	4a56003798	update donation	2016-01-21 22:32:10 +08:00