Commit Graph

2310 Commits (4d1c162ebd6b9dfc400fcc47eaa657640249f721)
 

Author SHA1 Message Date
winlin 575e50b6e2 hotfix to add comments on 1.0release 10 years ago
winlin 9c0d02f6a7 merge from 1.0release to master(develop) 10 years ago
winlin 62b861718f Revert "remove vs2010 files from master"
This reverts commit f8a2c22f3a.
10 years ago
winlin f8a2c22f3a remove vs2010 files from master 10 years ago
winlin b70bc74808 Merge branch 'allspace-master' into srs-librtmp 10 years ago
winlin 4c0c3a9ada refine merged code for allspace. 10 years ago
winlin 468941833c change srs version to 2.0.33 10 years ago
winlin 18c308248e refine code by winlin, for merged from allspace. 10 years ago
winlin 1855c9429c merge from allspace, to srs-librtmp, for vs2010 10 years ago
winlin bb54194c26 checkout master 10 years ago
winlin 1ce79980b1 checkout master 10 years ago
winlin c49981ed6f refine script 10 years ago
winlin b825ea62f9 refine comments 10 years ago
winlin 8766ab5de2 add git2unix script 10 years ago
winlin be53b10ed3 refine log position 10 years ago
winlin e76c53dae8 sleep when git commit failed. 10 years ago
winlin ff73088091 fix bug of git commit 10 years ago
winlin 93ee15a552 udpate github commit to git commit 10 years ago
winlin 55461e866f sync tags with csdn and oschina 10 years ago
winlin 131f598ab5 use multiple remote to commit and sync with csdn+oschina. 10 years ago
winlin 4c67ddca26 Merge branch 'srs.master' 10 years ago
winlin 6a5f405ba0 add github script 10 years ago
winlin c6133213cf Merge branch 'srs.1.0release' into 1.0release 10 years ago
winlin ad8b63d228 Merge branch 'srs.master' 10 years ago
winlin d91a9dfa9d udpate the srs_bwt. 10 years ago
winlin e11fa383ca udpate the srs_bwt. 10 years ago
winlin 499277a00e Merge branch 'srs.master' 10 years ago
winlin 02778dba4c udpate the srs_bwt. 10 years ago
winlin cb0620318c Merge branch 'srs.master' 10 years ago
winlin a2af051840 udpate the srs_bwt. 10 years ago
winlin 1c90b19035 Merge branch 'srs.1.0release' into 1.0release 10 years ago
winlin cd0ab5fb43 update PRIMARY, AUTHORS, CONTRIBUTORS rule 10 years ago
winlin db7af6259a update PRIMARY, AUTHORS, CONTRIBUTORS rule 10 years ago
winlin 5865b30b8d Merge branch 'srs.master' 10 years ago
winlin e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32. 10 years ago
winlin 9426b834d1 Merge branch 'srs.1.0release' into 1.0release 10 years ago
winlin 5a4c5f0f59 Merge branch 'srs.master' 10 years ago
winlin d672fae255 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 1.0.8 10 years ago
winlin 44962c9142 update PRIMARY, AUTHORS, CONTRIBUTORS rule 10 years ago
winlin 32cf44e5bb update PRIMARY, AUTHORS, CONTRIBUTORS rule 10 years ago
winlin 3c46bcbddc update PRIMARY, AUTHORS, CONTRIBUTORS rule 10 years ago
winlin c0cb87ba04 Merge branch 'srs.master' 10 years ago
winlin 5fde890603 update PRIMARY, AUTHORS, CONTRIBUTORS rule 10 years ago
winlin 8059f6f342 Merge branch 'srs.master' 10 years ago
winlin e492fa5353 fix #212, support publish aac adts raw stream. 2.0.31. 10 years ago
winlin 0c6282a048 Merge branch 'srs.master' 10 years ago
winlin 3d97048c3a fix bug #217, add reuse conn to play different player. 10 years ago
winlin 28ef4e122e Merge branch 'srs.master' 10 years ago
winlin 3e81e6e0f1 refine code for bug #217, use recv thread to set the timeout. 10 years ago
winlin 9ababa2a41 Merge branch 'srs.master' 10 years ago