Commit Graph

3331 Commits (66ffcad635ab706ac9804b1415c49913a14dedf6)
 

Author SHA1 Message Date
winlin c17a1198cb fix , disconnect when not keep alive.
winlin 46a81372e7 fix , set recv timeout for http connection.
winlin 6f8c076b30 add comments for srs thread, add never quit thread.
winlin 948d200ce1 fix , parse when got entire http header, by feilong. 2.0.164.
winlin 5d7b0edccc merge from bravo code, fix some warnings.
winlin 44bc7976ac merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.
winlin 0f7cafe50b order the xcode project
winlin f6d2fd991b merge from 2.0.162
winlin c617d2aaa5 support push flv stream over HTTP POST to SRS.
winlin 39f5f80b6c Merge branch '2.0release' into develop
winlin 77ee2400df fix the unicode to ascii
winlin 1fd69beea5 Merge branch '2.0release' into develop
winlin 7fc1cda392 add stream status to api.
winlin 7ce9398b41 Merge branch '2.0release' into develop
winlin ac13817aae update donation
winlin 60e10f2960 Merge branch '2.0release' into develop
winlin 0fd23c85cc update donation
winlin 2d61a8cfaf Merge branch '2.0release' into develop
winlin f6252c7f72 enable hls for push flv.
winlin 99e4bad56f update donation.
winlin 644454a4f5 Merge branch '2.0release' into develop
winlin ffdabf32ed add push flv conf
winlin f13c4d3a0f Merge branch '2.0release' into develop
winlin e221d002a2 fix the flv caster bug, when nread is 0, disconnect it.
winlin e516c7f7a5 Merge branch '2.0release' into develop
winlin ad32048c1c fix the http flv stream caster.
winlin cba6675560 refine the http message, set the connection if required.
winlin ba6c3132e3 refine code, use decoder to parse flv stream
winlin 411f5a1d2a Merge branch '2.0release' into develop
winlin ea1e015a4e fix the http read chunked encoding bug.
winlin da00b67c76 Merge branch '2.0release' into develop
winlin a95fd6d140 read the http flv stream.
winlin 022b6aa561 refine the http remux for http flv stream.
winlin f0c24eeacc add stream caster for post flv over http.
winlin f15e9f5b62 Merge branch '2.0release' into develop
winlin 4d18073dab update contact add skype.
winlin 91e285b0cd Merge branch '2.0release' into develop
winlin 4b372d8d16 change primary to the primary branch.
winlin 94681702e1 Merge branch '2.0release' into develop
winlin e63b8eda51 migarate to srs org.
winlin 42ddb76544 Merge branch '2.0release' into develop
winlin 8603dba697 migarate to srs org.
winlin 5819614ff0 migarate from winlinvip to srs org, move the copyright to srs org.
winlin fff838e4c1 migarate from winlinvip to srs org, move the copyright to srs org.
winlin 17b15deee6 Merge branch '2.0release' into develop
winlin b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org.
winlin 9189a408c1 Merge branch '2.0release' into develop
winlin 90b80ffc45 migarate from winlinvip to srs org.
winlin 53e92a17f5 Merge branch '2.0release' into develop
winlin 115daa3cc1 migarate from winlinvip to srs org