Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-05-12 10:36:37 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
add64533e30ee6e3f6fbeedf5aeb94bfb2f366d9
add64533
1 parent
1c1efd70
add donation user chen.chen
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
11 行增加
和
0 行删除
DONATIONS.txt
trunk/research/api-server/server.py
DONATIONS.txt
查看文件 @
add6453
...
...
@@ -3,3 +3,4 @@ Donations ordered by first donation.
* [2014-04-25 13:21] 刘连响 刘连响<notedit@gmail.com>
* [2014-04-25 13:25] 张瑞圣 大圣(5839109)
* [2014-04-25 13:31] 郭强 寒一冰(63395865)
* [2014-05-12 10:22] 陈晨 陈晨<undeadalpha@gmail.com>
...
...
trunk/research/api-server/server.py
查看文件 @
add6453
...
...
@@ -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"
}
}
},
"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"
}
}
}
}
}})
...
...
请
注册
或
登录
后发表评论