胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
12ba0223 1 parent 05e22e95

update readme, add ingest

内嵌 并排对比
正在显示 2 个修改的文件 包含 2 行增加 和 1 行删除
@@ -218,6 +218,7 @@ usr sys idl wai hiq siq| read writ| recv send| in out | int csw @@ -218,6 +218,7 @@ usr sys idl wai hiq siq| read writ| recv send| in out | int csw
218 * nginx v1.5.0: 139524 lines <br/> 218 * nginx v1.5.0: 139524 lines <br/>
219 219
220 ## History 220 ## History
  221 +* v1.0, 2014-04-06, support [ingest](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleIngest) file/stream/device.
221 * v1.0, 2014-04-05, support [http api](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPApi) and [http server](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPServer). 222 * v1.0, 2014-04-05, support [http api](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPApi) and [http server](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPServer).
222 * v1.0, 2014-04-03, implements http framework and api/v1/version. 223 * v1.0, 2014-04-03, implements http framework and api/v1/version.
223 * v1.0, 2014-03-30, fix bug for st detecting epoll failed, force st to use epoll. 224 * v1.0, 2014-03-30, fix bug for st detecting epoll failed, force st to use epoll.
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR "0" 32 #define VERSION_MAJOR "0"
33 #define VERSION_MINOR "9" 33 #define VERSION_MINOR "9"
34 -#define VERSION_REVISION "53" 34 +#define VERSION_REVISION "54"
35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION 35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "srs" 37 #define RTMP_SIG_SRS_KEY "srs"