add donation user chen.chen

winlin
Commit add64533e30ee6e3f6fbeedf5aeb94bfb2f366d9 add64533 1 parent 1c1efd70
DONATIONS.txt
trunk/research/api-server/server.py
--- a/DONATIONS.txt
查看文件 @add6453
+++ b/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>
--- a/trunk/research/api-server/server.py
查看文件 @add6453
+++ b/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"
+                                }
+                            }
                         }
                     }
                 }})