Commit Graph

793 Commits (bbac2348db0d72616f5057817f3bd5212992fd71)

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