胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
953ee8e1 2 parents a2c49620 805ff7b1

Merge branch 'srs.master'

内嵌 并排对比
正在显示 1 个修改的文件 包含 5 行增加 和 3 行删除
@@ -44,8 +44,9 @@ client/[edge](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Edge) p @@ -44,8 +44,9 @@ client/[edge](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Edge) p
44 [forward](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG), 44 [forward](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG),
45 [http hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPCallback), 45 [http hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPCallback),
46 [http api](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPApi), 46 [http api](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPApi),
47 -[http server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPServer),  
48 -[dvr](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DVR). 47 +[http server](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPServer),
  48 +[dvr](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DVR) and
  49 +[SRS-librtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp).
49 50
50 [SRS-librtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp) 51 [SRS-librtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp)
51 is a client library, only depends on c++ and socket, with 52 is a client library, only depends on c++ and socket, with
@@ -53,7 +54,8 @@ is a client library, only depends on c++ and socket, with @@ -53,7 +54,8 @@ is a client library, only depends on c++ and socket, with
53 publish, ingest flv/rtmp, inject flv, 54 publish, ingest flv/rtmp, inject flv,
54 [publish h264 raw stream](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data)), 55 [publish h264 raw stream](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data)),
55 [exported as seperate project or single cpp file by configure](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#export-srs-librtmp). 56 [exported as seperate project or single cpp file by configure](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#export-srs-librtmp).
56 -SRS-librtmp provides api about RTMP, FLV, AMF0 and 57 +[SRS-librtmp](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp)
  58 +provides apis to support RTMP, FLV, AMF0 and
57 [h.264 raw stream](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data). 59 [h.264 raw stream](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data).
58 60
59 WebSite: [http://ossrs.net](http://ossrs.net) <br/> 61 WebSite: [http://ossrs.net](http://ossrs.net) <br/>