Commit Graph

795 Commits (cd682ae4be1e227bd07a3e15bda96c95b88513cd)

Author SHA1 Message Date
winlin 692b751da8 for , support config the m3u8/ts path for hls. 2.0.149.
winlin 6776065b04 big support from all friends of SRS
winlin 11b93803de revert to SRS2.
winlin ab673e1300 for , osx(darwin) support demo with nginx and ffmpeg. 2.0.143.
winlin 19ec1dafb7 Merge branch '2.0release' into develop
winlin c32d9ee43e remove the contact from index.
winlin ef39a88f3d Merge branch '2.0release' into develop
winlin 5d7c24de48 update readme
winlin a21243ea12 merge from 2.0
winlin d349a3dbda update stable version check
winlin 519c25a064 fork srs2 and start srs3. 3.0.0
winlin 636bc574af start 2.0release, 80773 lines.
winlin 5e19f5f2b8 add qq and weixin image.
winlin 320f45c6f4 fix , support hstrs(http stream trigger rtmp source) edge mode. 2.0.140.
winlin 27cb62b7aa for , support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.
winlin 2adc069df0 update readme for why srs
winlin ffef62900f for , support adobe hds. 2.0.138.
winlin db7ddfd510 fix , , support osx(darwin) for mac pro. 2.0.137.
winlin 5143e3a58d fix , http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136
winlin 8dbabe3708 fix , refine aac LC, support aac HE/HEv2. 2.0.134.
winlin f31412db21 update readme.
winlin b3ef8e9d48 set stream caster to experiment state
winlin f26e719800 fix , fix http-flv stream bug, support multiple streams. 2.0.133.
winlin 3982ec1d87 refine http request parse. 2.0.132.
winlin 012c29e124 for , update the wiki.
winlin fb3fced8d0 for , revert dvr http api. 2.0.128.
winlin 4505983944 update readme, add why srs.
winlin e282fa94c0 update readme, add why srs.
winlin 6b0a8092ab update readme, add why srs.
winlin b903a7b436 for , dvr suport vhost/app/stream level control. 2.0.125.
winlin 1cb8e44b1b fix , fix hls bug, write pts/dts error. 2.0.124.
winlin a3648063d5 fix , support dvr http api. 2.0.123.
winlin 691f732204 for , update readme.
winlin a984eeecab refine dvr, append file when dvr file exists. 2.0.122.
winlin 1102c7a58f refine pithy print to more easyer to use 2.0.121.
winlin 9d233db27e fix , support push rtsp to srs. 2.0.120.
winlin d4ceff649f the join maybe failed, should use a variable to ensure thread terminated. 2.0.119.
winlin ccc30c70c4 the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.
winlin 78f34ad46f for , support config default acodec/vcodec. 2.0.118.
winlin 922150b2cf for , rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117.
winlin 25af6c6847 for , use stringstream to generate m3u8, add hls_td_ratio. 2.0.116.
winlin 9a7696a7c2 Merge branch '1.0release' of github.com:winlinvip/simple-rtmp-server into 1.0release
winlin 103ce78b35 Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop
winlin 4cf263876c update readme
winlin e1e12e5dba release 1.0r2
winlin 61b0ee55ed release 1.0r2
winlin d4f642504f update readme
winlin 16bf0a1826 dev code HuKaiqun for 1.0.27.
winlin f016245e20 dev code ZhouGuoWen for 2.0.115.
winlin 0e783f4548 Update README.md