external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

fix bug of flv parser, librtmp amf0 library

Browse source
This commit is contained in:
winlin 2014-05-22 11:39:10 +08:00
parent 60fdab7b3b
commit 69eb935505
4 changed files with 261 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/research/api-server/server.py
View file

@ -618,6 +618,14 @@ class RESTServers(object):
"stream7": "http://demo.chnvideo.com:8085/api/v1/servers?id=ingest&action=hls&device_id=chnvideo-meiyi-cubieboard&stream=live/stream7"
}
},
"meiyi-house": {
"rtmp": {
"livesteam": "http://demo.chnvideo.com:8085/api/v1/servers?id=ingest&action=rtmp&device_id=chnvideo-meiyi-cubieboard-house&stream=live/livestream"
},
"hls": {
"livesteam": "http://demo.chnvideo.com:8085/api/v1/servers?id=ingest&action=hls&device_id=chnvideo-meiyi-cubieboard-house&stream=live/livestream"
}
},
"meiyi-bk": {
"rtmp": {
"livesteam": "http://demo.chnvideo.com:8085/api/v1/servers?id=ingest&action=rtmp&device_id=chnvideo-meiyi-cubieboard-bk&stream=live/livestream",