Commit Graph

3314 Commits (c34b0c86e1b48d6f3e477bffe1a3117d046f609b)
 

Author SHA1 Message Date
winlin c34b0c86e1 fix #367, support nginx-rtmp exec. 3.0.1 10 years ago
winlin 7de181004f Merge branch '2.0release' into develop 10 years ago
lovecat 9c2beffe8f statistic connection bytes before remove client. 10 years ago
winlin 039af7243c for #367, refine the comments for process. 10 years ago
winlin 6fe88d088c for #367, process support redirect stdout and stderr. 10 years ago
winlin 0e1861b084 for #367: extract the process from ffmpeg to exec programs. 10 years ago
winlin 3a8c03a471 Merge branch '2.0release' into develop 10 years ago
winlin a242aa35dc add pid to srs rtmp dump 10 years ago
winlin 15102a7345 refine commit script 10 years ago
winlin 2a4b448cce Merge branch '2.0release' into develop 10 years ago
winlin a7f4104d45 fix bug of commit script 10 years ago
winlin d8030faabe Merge branch '2.0release' into develop 10 years ago
winlin 064031cac1 refine commit script 10 years ago
winlin 8e259eb0c2 refine the commit script 10 years ago
winlin 4118138cf0 update commit script 10 years ago
winlin b25c45c643 refine srs player, support set the bufferTimeMax. 10 years ago
winlin 74d4c96423 for #367, design the config for exec. 10 years ago
winlin cbfe438e73 for #367, design the config for exec. 10 years ago
winlin 5e48dab2b9 Merge branch '2.0release' into develop 10 years ago
winlin 21b175b4db add remote console to feature list. 10 years ago
winlin ce1627eb34 Merge branch '2.0release' into develop 10 years ago
winlin 899ecb5661 add remote console to feature list. 10 years ago
winlin 8d2b2d0148 Merge branch '2.0release' into develop 10 years ago
winlin ada33bdad7 add srs 1.0release time 10 years ago
winlin b4040a5fc9 Merge branch '2.0release' into develop 10 years ago
winlin 724498bb09 update 2.0 release file to srs2.0a0 10 years ago
winlin 7e475e15b0 release 2.0a0 10 years ago
winlin 28791fd14a release 2.0alpha0, the 2.0a0, 2.0.185 10 years ago
winlin 5721bc371c Merge branch '2.0release' into develop 10 years ago
winlin e43d4e46b4 support JSONP DELTE/POST/PUT 10 years ago
winlin baa70d4ddd add nb_streams for vhost 10 years ago
winlin 7a2836ae2a Merge branch '2.0release' into develop 10 years ago
winlin 6e5143449e HTTP API support JSONP by specifies the query string callback=xxx. 10 years ago
winlin 22485ce5e9 Merge branch '2.0release' into develop 10 years ago
winlin aeebddb269 for #442, add more information for client for api. 10 years ago
winlin 94641c812b fix #442, support kickoff client. 10 years ago
winlin b37797b13a for #442, add publish connection in stream.publish api 10 years ago
winlin 529803ed04 refine code for api. 10 years ago
winlin 1962449770 Merge branch '2.0release' into develop 10 years ago
winlin 6b6d951298 add api /api/v1/features 10 years ago
winlin 4763f205a2 add kbps for vhost and stream 10 years ago
winlin 0a4d78383c Merge branch '2.0release' into develop 10 years ago
winlin 20a8818a8e refine the error response. 10 years ago
winlin 2edcf1d4ff support query specified vhost 10 years ago
winlin 66a26bdce8 move json from app to protocol 10 years ago
winlin a7589b9ad3 refine code for api, add clients and parse_rest_id 10 years ago
winlin ab4620870d refine the stat api, support query specified stream. 10 years ago
winlin 32a484164a Merge branch '2.0release' into develop 10 years ago
winlin c75f05c88b fix the log cid display error, merge the publish recv thread log to publish connection. 10 years ago
winlin 9528243b81 Merge branch '2.0release' into develop 10 years ago