From 9bf408ad25b74e5d194cb14bb0139a60597ce902 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 18 Jan 2015 18:08:47 +0800 Subject: [PATCH] for bug #277, update readme remove the experiment for http server and http vod stream. --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b37eb110a2..16b21b6c81 100755 --- a/README.md +++ b/README.md @@ -443,13 +443,13 @@ Supported operating systems and hardware: [EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_DRM#tokentraverse) ) for fms origin authenticate. 1. Support system full utest on gtest. -1. [experiment] Support embeded HTTP server( -[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHTTP), -[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_SampleHTTP) +1. Support embeded HTTP server( +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_SampleHTTP), +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_SampleHTTP) ) for hls(live/vod) -1. [experiment] Support vod stream(http flv/hls vod stream)( -[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FlvVodStream), -[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_EN_FlvVodStream) +1. Support vod stream(http flv/hls vod stream)( +[CN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_CN_FlvVodStream), +[EN](https://github.com/winlinvip/simple-rtmp-server/wiki/v2_EN_FlvVodStream) ). 1. Stable [1.0release branch](https://github.com/winlinvip/simple-rtmp-server/tree/1.0release) and [2.0dev branch](https://github.com/winlinvip/simple-rtmp-server/tree/master).