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

add donation user chen.chen

Browse source
This commit is contained in:
winlin 2014-05-12 10:36:37 +08:00
parent 1c1efd7000
commit add64533e3
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
DONATIONS.txt
View file

@ -3,3 +3,4 @@ Donations ordered by first donation.
* [2014-04-25 13:21] 刘连响 刘连响<notedit@gmail.com> * [2014-04-25 13:21] 刘连响 刘连响<notedit@gmail.com>
* [2014-04-25 13:25] 张瑞圣 大圣(5839109) * [2014-04-25 13:25] 张瑞圣 大圣(5839109)
* [2014-04-25 13:31] 郭强 寒一冰(63395865) * [2014-04-25 13:31] 郭强 寒一冰(63395865)
* [2014-05-12 10:22] ³Â³¿ ³Â³¿<undeadalpha@gmail.com>

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

@ -594,6 +594,16 @@ class RESTServers(object):
"transformers": "http://demo.chnvideo.com:8085/api/v1/servers?id=ingest&action=hls&device_id=chnvideo-sales-hiwifi&stream=live/transformers" "transformers": "http://demo.chnvideo.com:8085/api/v1/servers?id=ingest&action=hls&device_id=chnvideo-sales-hiwifi&stream=live/transformers"
} }
} }
},
"cubieboard": {
"meiyi": {
"rtmp": {
"livesteam": "http://demo.chnvideo.com:8085/api/v1/servers?id=ingest&action=rtmp&device_id=chnvideo-meiyi-cubieboard&stream=live/livestream"
},
"hls": {
"livesteam": "http://demo.chnvideo.com:8085/api/v1/servers?id=ingest&action=hls&device_id=chnvideo-meiyi-cubieboard&stream=live/livestream"
}
}
} }
} }
}}) }})