- Url(RTMP/HTTP):
+ Url(RTMP/HTTP):
diff --git a/README.md b/README.md
index 8740f1cf7..4a93dc5ec 100755
--- a/README.md
+++ b/README.md
@@ -63,6 +63,7 @@ For example, use ffmpeg to publish:
step 8: play live stream.
+players: http://demo:80/players rtmp url: rtmp://demo:1935/live/livestream m3u8 url: http://demo:80/live/livestream.m3u8 for android: http://demo:80/live/livestream.html diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh old mode 100644 new mode 100755 index a52470848..31541ad12 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -252,6 +252,9 @@ if [ $SRS_HLS = YES ]; then html_file=${SRS_OBJS}/nginx/html/forward/live/livestream.html && hls_stream=livestream.m3u8 && write_nginx_html5 html_file=${SRS_OBJS}/nginx/html/forward/live/livestream_ld.html && hls_stream=livestream_ld.m3u8 && write_nginx_html5 html_file=${SRS_OBJS}/nginx/html/forward/live/livestream_sd.html && hls_stream=livestream_sd.m3u8 && write_nginx_html5 + + # copy players to nginx html dir. + cp research/players ${SRS_OBJS}/nginx/html/ -r fi if [ $SRS_HLS = YES ]; then diff --git a/trunk/configure b/trunk/configure index 9d69081a7..698ee8f73 100755 --- a/trunk/configure +++ b/trunk/configure @@ -180,6 +180,7 @@ echo "\" make \" to build the srs(simple rtmp server)." echo "\" make help \" to get the usage of make" if [ $SRS_HLS = YES ]; then echo "\" sudo ./objs/nginx/sbin/nginx \" to start the nginx http server for hls" + echo "\" http://demo:80/players \" rtmp players(OSMF/JWPlayer)" fi if [ $SRS_FFMPEG = YES ]; then echo -e "\" ./objs/ffmpeg/bin/ffmpeg \" is used for live stream transcoding" diff --git a/trunk/research/players/jwplayer5/index.html b/trunk/research/players/jwplayer5/index.html old mode 100644 new mode 100755 index 56f5adb3f..aa36e15e2 --- a/trunk/research/players/jwplayer5/index.html +++ b/trunk/research/players/jwplayer5/index.html @@ -17,7 +17,7 @@diff --git a/trunk/research/players/jwplayer6/index.html b/trunk/research/players/jwplayer6/index.html old mode 100644 new mode 100755 index 96d981931..ce667be99 --- a/trunk/research/players/jwplayer6/index.html +++ b/trunk/research/players/jwplayer6/index.html @@ -17,7 +17,7 @@- Url(RTMP/HTTP): + Url(RTMP/HTTP):diff --git a/trunk/research/players/osmf/index.html b/trunk/research/players/osmf/index.html old mode 100644 new mode 100755 index 8619ea125..6b8a73008 --- a/trunk/research/players/osmf/index.html +++ b/trunk/research/players/osmf/index.html @@ -19,7 +19,7 @@ div.control{padding-bottom:10px; background-color:#333333; }- Url(RTMP/HTTP): + Url(RTMP/HTTP):- Url(RTMP/HTTP): + Url(RTMP/HTTP):