external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Code Issues Releases Wiki Activity
4221 commits 13 branches 107 tags 375 MiB
Commit graph

4221 commits

This branch
This branch
All branches
Author SHA1 Message Date
winlin
8ab43b3e78 Fix #794, refine the comments. 2017-03-04 14:29:17 +08:00
winlin
8a53128a37 Merge SRS2 2017-03-02 21:55:52 +08:00
winlin
795c94a92f Release v2.0r0, 2.0.234 2017-03-02 21:41:15 +08:00
winlin
dee17df83e Release 2.0r0, 2.0.234 2017-03-02 21:02:25 +08:00
winlin
308c6fee18 Fix #786, simply don't reuse object. 3.0.20 2017-03-02 16:43:06 +08:00
winlin
7680ac04ad Refine srs-librtmp 2017-03-01 18:09:07 +08:00
winlin
1743899a23 Refine code 2017-03-01 13:49:50 +08:00
winlin
16cde27a1e Remove MacOS compile option, for it's on use. It's caused by paralell make 2017-03-01 12:39:42 +08:00
winlin
121a2e5886 For #110, refine thread object. 3.0.19 2017-03-01 12:28:32 +08:00
winlin
44014683e1 Refine thread. 2017-03-01 12:23:44 +08:00
winlin
5bec6a4fdd Refine srs-librtmp 2017-03-01 12:03:49 +08:00
winlin
011b693235 Update srs-librtmp, set errno to ret when failed. 2017-03-01 11:00:54 +08:00
winlin
72c4ae4a8c Refine srs-librtmp API, change print to format 2017-03-01 10:52:57 +08:00
winlin
ad87bd7cf2 Refine configure 2017-03-01 09:21:20 +08:00
winlin
68a5407b3a Remove using of connect_app2. 2017-02-28 20:35:56 +08:00
winlin
26c20db2b3 Fix parse srs version bug 2017-02-28 20:03:46 +08:00
winlin
c849010fe2 Refine api for srs-librtmp 2017-02-28 19:46:09 +08:00
winlin
af73e8ee65 Add log functions for srs-librtmp 2017-02-28 16:19:54 +08:00
winlin
ca43bfe6d9 Fix build failed, for srs librtmp API changed. 2017-02-28 14:54:53 +08:00
winlin
cdfded6a74 Support disable valgrind 2017-02-28 14:47:00 +08:00
winlin
89a5fa69d1 Refine srs-librtmp, set the schema, rather that connect app3 2017-02-28 14:07:14 +08:00
winlin
4e96c443d8 Change the bool to int for C 2017-02-27 17:39:29 +08:00
winlin
747d6f2f52 For #299, write legal MPD, fix CORS. 2017-02-26 21:45:08 +08:00
winlin
8ab727f3c5 For #299, write MPD file. 2017-02-26 20:40:33 +08:00
winlin
e754ab7073 Update readme for Kafka, DVR MP4 and compare 2017-02-26 09:24:46 +08:00
winlin
35de69c0c2 Merge branch 'HungMingWu-develop' into develop 2017-02-25 22:06:41 +08:00
winlin
988618cb6c Merge branch 'develop' of https://github.com/HungMingWu/srs into HungMingWu-develop 2017-02-25 22:00:09 +08:00
winlin
bd84e476e6 For #730, remove the test code. 2.0.234 2017-02-25 20:24:56 +08:00
winlin
3903d2a8e3 For #730, remove the test code. 2.0.234 2017-02-25 20:24:18 +08:00
HungMingWu
a6582c6208 Disable openssl thread support to prevent ubuntu linking pthread error 2017-02-25 09:47:29 +00:00
winlin
764cf245e9 For #774, build librtmp exmaples failed for -lpthread 2017-02-25 12:13:12 +08:00
winlin
ac0e27b936 For #774, refine code style 2017-02-25 12:10:41 +08:00
HungMingWu
01d5e4da17 Replace openssl from l-1.0.1f to 1.10e (#774) 
DUe to API breakchange, add a wrapper for backward compatibility
 2017-02-25 12:06:39 +08:00
winlin
695ceeab48 Refine code for #777 2017-02-25 11:30:25 +08:00
Chengdong Zhang
a3df4e3bfb Fix #744 http callback set a wrong default port (#777) 
* Add port verify

Code is more robust

* Verify port

Verify port

* Change hard code to defined.

Change hard code to defined.
 2017-02-25 11:28:59 +08:00
winlin
d786d61685 Merge branch '2.0release' into develop 2017-02-25 11:21:56 +08:00
winlin
0059b1cf7a For #783, use directly free to replace auto free 2017-02-25 11:18:54 +08:00
ljx0305
b0d16840b5 fix Repeated release (#783) 
fix  Repeated release
 2017-02-25 11:15:27 +08:00
winlin
cee9d736a4 for #299, refine code. 2017-02-19 22:03:51 +08:00
winlin
ede1c34a25 for #299, refine the signature of api for hls/dash 2017-02-19 21:48:32 +08:00
winlin
711b58e0b2 Merge pull request #763 from HungMingWu/develop 
Replace ffmpeg version from 2.1.1 to 3.2.4
 2017-02-18 14:04:39 +08:00
HungMingWu
33d6274217 Replace ffmpeg version from 2.1.1 to 3.2.4 2017-02-13 23:29:39 +08:00
winlin
2fcd3972c1 for #299, refine the encoder object name 2017-02-12 21:50:02 +08:00
winlin
2a4f57a587 Fix #301, User must config the codec in right way for HLS. 3.0.18 2017-02-12 20:55:35 +08:00
winlin
d612a21bad for #299, refine audio codec object name 2017-02-12 20:46:24 +08:00
winlin
caf69f193d for #299, refine the codec object name 2017-02-12 20:38:39 +08:00
winlin
d7458c4e72 For #299, refine the codec to format-frame-sample chain. 2017-02-12 18:18:18 +08:00
winlin
c4a510b834 For #299, refine the codec info structure. 2017-02-11 23:09:23 +08:00
winlin
5e419c66f8 For #299, add dash files. 2017-02-11 21:14:28 +08:00
winlin
7fd221ef63 Always enable DVR 2017-02-11 17:27:40 +08:00