Commit Graph

1259 Commits (d9e37d2f54c3bfcf241b23c23f8adfa84beeda99)

Author SHA1 Message Date
winlin d9e37d2f54 Merge branch '2.0release' into 3.0release 7 years ago
winlin a6bc53cb85 Merge #1039, fix bug of init.d script. 7 years ago
winlin 5730bf8e43 Fix #913, support complex error. 3.0.26 7 years ago
winlin b426036832 Merge #1033, allow user to add some specific flags. 2.0.244 7 years ago
winlin 59b53dab8b Merge from SRS2 7 years ago
winlin a1df3c6f36 Remove CSDN mirror 7 years ago
winlin b88265fc78 Update readme 8 years ago
winlin ba2b82f29c Refine English of Readme 8 years ago
winlin 1d35ae21ec Update README.md 8 years ago
winlin 4d6c1b1a17 Update README.md 8 years ago
winlin 9c6d7a71d0 Update README.md 8 years ago
winlin 535fa034af Update README.md 8 years ago
winlin ad6f318ea6 Update README.md 8 years ago
winlin 92fb9b4a72 Update README.md 8 years ago
winlin f871c26380 Update README.md 8 years ago
winlin 2207adebed Update README.md 8 years ago
winlin ec335c692d Update README.md 8 years ago
winlin 6749582f1e Update README.md 8 years ago
winlin a5925ca904 Update README.md 8 years ago
winlin 159ef9e1c4 Update README.md 8 years ago
winlin f9056caae0 Merge branch 'develop' into 3.0release 8 years ago
winlin 494879f6ed Update README.md 8 years ago
winlin f641f06171 Update README.md 8 years ago
winlin 34c73b6bec Update README.md 8 years ago
winlin 9ae54850bf Update readme for json 8 years ago
winlin 4e4091231e Refine object create in server. 8 years ago
winlin c32afb95ab Release v2.0-r2, 2.0.243 8 years ago
winlin e309be154e Release v2.0-r2, 2.0.243 8 years ago
winlin 20cacd5ea0 Update readme for DASH 8 years ago
winlin 58521751c3 Fix #299, support experimental MPEG-DASH. 3.0.25 8 years ago
winlin 6c64297264 Fix #821, support MP4 file parser. 3.0.24 8 years ago
winlin 1bf99e8f3e For #907, Wrap ST, only use in service ST. 8 years ago
winlin 54411e0768 Fix #904, replace NXJSON(LGPL) with json-parser(BSD). 3.0.23 8 years ago
winlin 5792c462b8 Merge branch 'develop' into 3.0release 8 years ago
winlin c4966484e1 For #893, #899, merge SRS2 8 years ago
winlin e8cb2e6be4 Merge #899 to fix #893, ts PES ext length. 2.0.243 8 years ago
winlin 2677ec8c3f Update license mixing 8 years ago
winlin f97260be1d Merge SRS2 8 years ago
winlin a613eb78c6 Fix #865, shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242 8 years ago
winlin ae5450181c Fix #636, FD leak for requesting empty HTTP stream. 2.0.241 8 years ago
winlin c97f2233a2 Merge SRS2 for #851 8 years ago
winlin ff87318b95 Fix #851, HTTP API support number of video frames for FPS. 2.0.240 8 years ago
winlin d0bf47906d Merge SRS2 8 years ago
winlin 4167715153 Release 2.0r1, 2.0.239 8 years ago
winlin d15c21a034 Merge branch '2.0release' into develop 8 years ago
winlin f2dd866c78 Fix typo of Readme. 8 years ago
winlin 9a2a6ab95f Merge SRS2 8 years ago
winlin 5e284b58a4 Fix #848, crash at HTTP fast buffer grow 2.0.239 8 years ago
winlin a98c9e04e3 Fix #547, support HLS audio in TS. 3.0.22 8 years ago
winlin 1054b0a90f Merge SRS2 8 years ago