Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/pchab/AndroidRTC
Browse files Browse the repository at this point in the history
  • Loading branch information
pchab committed Mar 28, 2015
2 parents 40d6c97 + 570af30 commit 20920c8
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
## WebRTC Live Streaming

An Android client for [ProjectRTC](https://github.com/pchab/ProjectRTC).
The apk is available [here](https://github.com/pchab/ProjectRTC/raw/master/AndroidRTC.apk).

It is designed to demonstrate WebRTC video calls between androids and/or desktop browsers, but WebRtcClient could be used in other scenarios.

Expand All @@ -20,7 +19,7 @@ Your stream should appear as "android_test" in ProjectRTC, so you can also use t
## Libraries

### [libjingle peerconnection](https://code.google.com/p/webrtc/)
### [android-websockets](https://github.com/koush/android-websockets)
### [socket.io-client](https://github.com/nkzawa/socket.io-client.java)

If you want to use them in your project, I recommend working with IntelliJ IDEA :

Expand Down

0 comments on commit 20920c8

Please sign in to comment.