1934 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	dea0b4fc3e	Update README.md	2015-07-13 12:11:40 +08:00
winlin	63c4140171	Merge branch 'master' into 1.0release	2015-06-17 16:43:19 +08:00
winlin	3364959ef9	Merge pull request #427 from reduxionist/patch-1 ... Update README.md	2015-06-17 16:41:18 +08:00
Jonathan Barratt	bac794dd61	Update README.md ... Correct path in installation instructions since project repository renamed to srs from simple-rtmp-server	2015-06-17 14:31:47 +07:00
winlin	401484db03	Merge branch '1.0release'	2015-05-23 10:40:39 +08:00
winlin	2cfec23f9b	release 1.0r4, 1.0.32	2015-05-23 10:40:32 +08:00
winlin	99ce283aad	Merge branch '1.0release'	2015-05-23 10:13:55 +08:00
winlin	e3622d446e	fix #397, the USER_HZ maybe not 100. 1.0.32	2015-05-22 17:08:26 +08:00
winlin	0c4739b27f	migarate from winlinvip to srs org.	2015-04-29 17:27:00 +08:00
winlin	921a56db9d	migarate from winlinvip to srs org	2015-04-29 17:02:39 +08:00
wenjie.zhao	a28d57657b	remove test file hello_srs.txt	2015-04-02 02:37:45 +08:00
wenjie.zhao	000122bcb2	test push	2015-04-02 01:51:49 +08:00
winlin	2a88a7c99b	Merge branch '1.0release'	2015-04-29 17:27:08 +08:00
winlin	a56013b412	migarate from winlinvip to srs org	2015-04-29 17:03:53 +08:00
winlin	b88d5640a4	merge from srs.winlin	2015-04-29 15:21:40 +08:00
winlin	9d8a60da7d	Initial commit	2015-04-29 14:59:33 +08:00
winlin	9a61ddf6ed	fix hls aac adts bug, in aac mux. 1.0.31.	2015-03-26 20:06:54 +08:00
winlin	7df037a6fa	Merge branch '1.0release'	2015-03-20 18:08:07 +08:00
winlin	612c544d70	refine script for pi.	2015-03-20 18:08:00 +08:00
winlin	27214e8544	Merge branch '1.0release'	2015-03-20 15:11:06 +08:00
winlin	720230b5f3	remove the sudo of log.	2015-03-20 15:10:58 +08:00
winlin	f6c3ef527a	Merge branch '1.0release'	2015-03-19 11:00:02 +08:00
winlin	264624c55c	release 1.0r3	2015-03-19 10:59:53 +08:00
winlin	f5abe2414c	Merge branch '1.0release'	2015-03-19 10:54:28 +08:00
winlin	c991c2c92c	remove osx support for 1.0.30	2015-03-17 21:00:28 +08:00
winlin	3dda354d38	remove the contact from index.	2015-03-15 22:00:47 +08:00
winlin	13299ac03a	remove the contact from index.	2015-03-15 22:00:24 +08:00
winlin	73f1c2e602	add qq and weixin image.	2015-03-14 22:36:29 +08:00
winlin	5dbe8d5bd3	add qq and weixin image.	2015-03-14 22:12:56 +08:00
winlin	6d64e38656	warning when join thread failed. 1.0.29	2015-03-10 14:35:20 +08:00
winlin	ccc30c70c4	the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.	2015-02-17 21:01:44 +08:00
winlin	99a455fdeb	release 1.0r2	2015-02-12 10:45:44 +08:00
winlin	9a7696a7c2	Merge branch '1.0release' of github.com:winlinvip/simple-rtmp-server into 1.0release	2015-02-12 10:41:55 +08:00
winlin	e1e12e5dba	release 1.0r2	2015-02-12 10:19:19 +08:00
winlin	61b0ee55ed	release 1.0r2	2015-02-12 10:18:45 +08:00
winlin	16bf0a1826	dev code HuKaiqun for 1.0.27.	2015-02-12 10:14:30 +08:00
winlin	d07f09aa0b	Update README.md	2015-02-11 12:28:48 +08:00
winlin	b982b27f6f	add dev code for each release. HuKaiqun for SRS1.0	2015-02-11 08:48:22 +08:00
winlin	d5e3ac4e7d	for #310, the aac profile must be object plus one. 1.0.26	2015-02-10 17:15:50 +08:00
winlin	7888506999	update readme for 1.0.25	2015-01-25 13:33:23 +08:00
winlin	9cbc753e8e	for #151, #268, refine the pcr start at 0, dts/pts plus delay. 1.0.25	2015-01-25 13:30:45 +08:00
winlin	b0daf1482d	update version to 1.0.24	2015-01-25 13:10:30 +08:00
winlin	1835957a2b	for #151, refine pcr=dts-800ms and use dts/pts directly. 1.0.24	2015-01-25 13:04:12 +08:00
winlin	4f5cc9c403	for #151, use absolutely overflow to make jwplayer happy. 1.0.23	2015-01-23 15:14:29 +08:00
winlin	4449a8d7b0	fix #290, use iformat only for rtmp input. 1.0.22	2015-01-17 13:04:52 +08:00
winlin	cd0e35720d	Merge branch '1.0release'	2015-01-15 11:38:09 +08:00
winlin	118efcbbf8	update the file for 1.0rc1.	2015-01-15 11:38:03 +08:00
winlin	c984f4370a	merge from 1.0release for 1.0rc1, 1.0.21	2015-01-15 11:32:40 +08:00
winlin	98fb50464a	update readme for 1.0r1, 1.0.21	2015-01-15 11:31:07 +08:00
winlin	9bbce05778	publish 1.0r1 release(1.0.20)	2015-01-15 11:30:03 +08:00