Commit Graph

265 Commits (abcaba33ee82faa537441137aa94905ca4d57fe0)

Author SHA1 Message Date
winlin abcaba33ee For #913: TS/HLS/MPEGTS support complex error 8 years ago
winlin 20a42599f3 For #913, http callback use complex error 8 years ago
winlin fd91df9411 For #913, reload use complex error 8 years ago
winlin 9f5224c34a For #913, use complex error for http 8 years ago
winlin 5c9a12e72a For #913, use complex error for listener 8 years ago
winlin 9db2a04c3b For #913, coroutine support complex error. 8 years ago
winlin 1bf99e8f3e For #907, Wrap ST, only use in service ST. 8 years ago
winlin 2ed2513f08 For #906, #902, use coroutine for one cycle thread 8 years ago
HungMingWu 815d50f00a Remove warning: C++11 requires a space between string literal and macro (#874)
On Ubuntu 17.04, the default gcc compiler version is 6.3.0.
It switch standard from c++98 to c++11.
So it would generate verbose warnings.
8 years ago
winlin c97f2233a2 Merge SRS2 for #851 8 years ago
winlin ff87318b95 Fix #851, HTTP API support number of video frames for FPS. 2.0.240 8 years ago
winlin 18d9f6c8f1 Fix build failed. 8 years ago
winlin 1054b0a90f Merge SRS2 8 years ago
winlin 33a0abdeff Fix #844, support Haivision encoder. 2.0.238 8 years ago
winlin 33375db401 Merge from SRS2, for #834 8 years ago
winlin b11ddc7f41 Fix #834, crash for TS context corrupt. 2.0.235 8 years ago
winlin e3526c0cf6 For #820, modules use service only. 8 years ago
winlin 0a57a46016 Refine LICENSE 8 years ago
winlin f32aab3d92 For #299, refine code. 8 years ago
Chengdong Zhang 8ad934a8a4 srs_info use not available variable (#813)
srs_info use not available variable.
Variable has been removed or changed.
8 years ago
winlin 308c6fee18 Fix #786, simply don't reuse object. 3.0.20 8 years ago
winlin c849010fe2 Refine api for srs-librtmp 8 years ago
winlin a1fcf66f32 for #742, always enable http utilities. 8 years ago
winlin 79def81792 for #742, refine the rtmp conn, use info as data cluster. 8 years ago
winlin 39aee2b318 for #742, fix publish recv thread bug. 8 years ago
winlin 954bb186c1 identify the flash and fmle for recv thread. 8 years ago
winlin 5c959fc781 merge from srs2, for kbps free io 8 years ago
winlin 310032d8d8 merge srs2, timestamp overflow for ATC. 8 years ago
cenxinwei 762d7a8884 fix publish_normal_timeout 配置读取错误 8 years ago
winlin 3fe338d1c5 for #742, use ms for application clock tbn. 8 years ago
winlin dca9749f37 for #742, refine the object live cycle. 3.0.15 8 years ago
winlin f4c0af8bfc refine code remove dup api for #742 8 years ago
winlin d49f195bbf fix #734, log format error. 8 years ago
winlin 1b175b1107 for #730, support config in/out ack size. 3.0.13 8 years ago
winlin 7ac932cfa0 update to 2013-2017 8 years ago
winlin 664844b5f5 merge from srs2. for #513. 8 years ago
winlin 759c84a395 for #513, remove hls ram from srs2 to srs3+. 2.0.224 8 years ago
winlin 9ba4bed648 merge srs2 8 years ago
winlin cb1d47bfef fix #713, refine source to avoid critical fetch and create. 2.0.222 8 years ago
winlin 9a3674c624 refine kafka 8 years ago
winlin 7d96a33207 Merge branch '2.0release' into develop 9 years ago
winlin e2865c6ac1 workaround for #511, the fly stfd in close. 2.0.211 9 years ago
winlin 79fdc4e766 fix bug for rtmp client use NULL ptr. 9 years ago
winlin 7ae2c6bf50 merge from srs2. 9 years ago
winlin eca46c03d2 refine code for consumer to refer the rtmp connection. 9 years ago
winlin 11e11005ac specifies the try default vhost 9 years ago
winlin a7bf4bfda5 refine code, ignore client when no ip. 9 years ago
winlin d0c74fa7cd update 2015 to 2016 9 years ago
winlin 5ac8177ce6 fix bugs 9 years ago
winlin 01c46bdbfd rename org simle-rtmp-server to ossrs 9 years ago