Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/livepeer/lpms
Browse files Browse the repository at this point in the history
  • Loading branch information
ericxtang committed Mar 24, 2017
2 parents dad847d + 2bba895 commit 7c7bd74
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# LPMS - Livepeer media server

LPMS is a media server that can run independantly, or on top of the [Livepeer](https://livepeer.org)
LPMS is a media server that can run independently, or on top of the [Livepeer](https://livepeer.org)
network. It allows you to manipulate / broadcast a live video stream. Currently, LPMS supports RTMP
as input format and RTMP/HLS as output formats.

Expand All @@ -21,7 +21,7 @@ LPMS requires ffmpeg. To install it on OSX, use homebrew. As a part of this in

```
//This may take a few minutes
brew install ffmpeg --with-fdk-aac --with-ffplay --with-freetype --with-libass --with-libquvi --with-libvorbis --with-libvpx --with-opus --with-x265
brew install ffmpeg --with-sdl2 --with-libx264
```

LPMS uses [SRS](http://ossrs.net/srs.release/releases/) as a transcoding backend. It's included in
Expand Down

0 comments on commit 7c7bd74

Please sign in to comment.