Commit Graph

3303 Commits (d8030faabe93ff574bcc334f71480a8f801a7490)
 

Author SHA1 Message Date
winlin d8030faabe Merge branch '2.0release' into develop
winlin 064031cac1 refine commit script
winlin 8e259eb0c2 refine the commit script
winlin 4118138cf0 update commit script
winlin b25c45c643 refine srs player, support set the bufferTimeMax.
winlin 74d4c96423 for , design the config for exec.
winlin cbfe438e73 for , design the config for exec.
winlin 5e48dab2b9 Merge branch '2.0release' into develop
winlin 21b175b4db add remote console to feature list.
winlin ce1627eb34 Merge branch '2.0release' into develop
winlin 899ecb5661 add remote console to feature list.
winlin 8d2b2d0148 Merge branch '2.0release' into develop
winlin ada33bdad7 add srs 1.0release time
winlin b4040a5fc9 Merge branch '2.0release' into develop
winlin 724498bb09 update 2.0 release file to srs2.0a0
winlin 7e475e15b0 release 2.0a0
winlin 28791fd14a release 2.0alpha0, the 2.0a0, 2.0.185
winlin 5721bc371c Merge branch '2.0release' into develop
winlin e43d4e46b4 support JSONP DELTE/POST/PUT
winlin baa70d4ddd add nb_streams for vhost
winlin 7a2836ae2a Merge branch '2.0release' into develop
winlin 6e5143449e HTTP API support JSONP by specifies the query string callback=xxx.
winlin 22485ce5e9 Merge branch '2.0release' into develop
winlin aeebddb269 for , add more information for client for api.
winlin 94641c812b fix , support kickoff client.
winlin b37797b13a for , add publish connection in stream.publish api
winlin 529803ed04 refine code for api.
winlin 1962449770 Merge branch '2.0release' into develop
winlin 6b6d951298 add api /api/v1/features
winlin 4763f205a2 add kbps for vhost and stream
winlin 0a4d78383c Merge branch '2.0release' into develop
winlin 20a8818a8e refine the error response.
winlin 2edcf1d4ff support query specified vhost
winlin 66a26bdce8 move json from app to protocol
winlin a7589b9ad3 refine code for api, add clients and parse_rest_id
winlin ab4620870d refine the stat api, support query specified stream.
winlin 32a484164a Merge branch '2.0release' into develop
winlin c75f05c88b fix the log cid display error, merge the publish recv thread log to publish connection.
winlin 9528243b81 Merge branch '2.0release' into develop
winlin 3c402cb908 refine the tcp nodelay, effect connected connections.
winlin 71aacebcbc Merge branch '2.0release' into develop
winlin c31a546eec support vhost for http flv.
winlin 0afe4963bc Merge branch '2.0release' into develop
winlin dd21eee7f0 srs player show current time and url
winlin ce8f446494 Merge branch '2.0release' into develop
winlin dfecfb65b1 support fluency and stream empty count
winlin fcd2d3d445 refine code for link generation from rtmp url.
winlin fe87bf1b61 support generate link page for rtmp url
winlin 018af55d65 refine the demo pages, move scripts after body.
winlin 77765b463a Merge branch '2.0release' into develop