Merge pull request #4 from livepeer/vendoreth

Vendoreth
This commit is contained in:
Eric Tang
2017-03-07 10:17:14 -08:00
committed by GitHub
5 changed files with 14 additions and 12 deletions
+5 -3
View File
@@ -1,4 +1,6 @@
# lpms
Livepeer media server
# LPMS - Livepeer media server
Currently it's not yet a stand-alone server. The goal of this project is to create an open source media server that handles live stream video transcoding at scale.
This is meant to be a standalone server, but at the moment it is
coupled with the go-livepeer repo. For the time being development will
proceed at the
[github.com/livepeer/go-livepeer/lpms package](https://github.com/livepeer/go-livepeer/lpms).
+1 -1
View File
@@ -16,7 +16,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/swarm/storage/streaming"
"github.com/livepeer/go-livepeer/livepeer/storage/streaming"
"github.com/golang/groupcache/lru"
"github.com/kz26/m3u8"
lpmsCommon "github.com/livepeer/lpms/common"
+3 -3
View File
@@ -8,9 +8,9 @@
package lpms
import (
"github.com/ethereum/go-ethereum/swarm/network"
"github.com/ethereum/go-ethereum/swarm/storage"
"github.com/ethereum/go-ethereum/swarm/storage/streaming"
"github.com/livepeer/go-livepeer/livepeer/network"
"github.com/livepeer/go-livepeer/livepeer/storage"
"github.com/livepeer/go-livepeer/livepeer/storage/streaming"
"github.com/livepeer/lpms/common"
"github.com/livepeer/lpms/server"
streamingVizClient "github.com/livepeer/streamingviz/client"
+3 -3
View File
@@ -14,10 +14,10 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/swarm/network"
"github.com/livepeer/go-livepeer/livepeer/network"
"github.com/ethereum/go-ethereum/swarm/network/kademlia"
"github.com/ethereum/go-ethereum/swarm/storage"
"github.com/ethereum/go-ethereum/swarm/storage/streaming"
"github.com/livepeer/go-livepeer/livepeer/storage"
"github.com/livepeer/go-livepeer/livepeer/storage/streaming"
lpmsIo "github.com/livepeer/lpms/io"
streamingVizClient "github.com/livepeer/streamingviz/client"
"github.com/nareix/joy4/format/flv"
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/swarm/network/kademlia"
"github.com/ethereum/go-ethereum/swarm/storage"
"github.com/ethereum/go-ethereum/swarm/storage/streaming"
"github.com/livepeer/go-livepeer/livepeer/storage"
"github.com/livepeer/go-livepeer/livepeer/storage/streaming"
"github.com/livepeer/lpms/io"
"github.com/livepeer/lpms/types"
streamingVizClient "github.com/livepeer/streamingviz/client"