summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrandomdan <randomdan@localhost>2014-04-17 20:53:31 +0000
committerrandomdan <randomdan@localhost>2014-04-17 20:53:31 +0000
commit1e6dfe1c5521ff4f1395ee094e93556d62327680 (patch)
treeec0d6df9b33ea92a2c0aac2ea159713bb52080dc
parentAdd event search method (diff)
downloadp2pvr-1e6dfe1c5521ff4f1395ee094e93556d62327680.tar.bz2
p2pvr-1e6dfe1c5521ff4f1395ee094e93556d62327680.tar.xz
p2pvr-1e6dfe1c5521ff4f1395ee094e93556d62327680.zip
Service stream in html5 compatible webm by default
-rw-r--r--p2pvr/p2comp/serviceStream.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/p2pvr/p2comp/serviceStream.cpp b/p2pvr/p2comp/serviceStream.cpp
index aedb4ad..307cb93 100644
--- a/p2pvr/p2comp/serviceStream.cpp
+++ b/p2pvr/p2comp/serviceStream.cpp
@@ -49,7 +49,7 @@ class ServiceStream : public StreamBase {
DECLARE_OPTIONS(ServiceStream, "P2PVR Live Stream options")
("p2pvr.livestream.muxercommand", Options::value(&muxerCommand, "/usr/bin/ffmpeg -f mpegts -i - -f dvd -codec copy -"),
- "Command to perform TS->PS muxing (default: '/usr/bin/ffmpeg -f mpegts -i - -f dvd -codec copy -')")
+ "Command to perform TS->PS muxing (default: '/usr/bin/ffmpeg -f mpegts -i - -f webm -')")
END_OPTIONS(ServiceStream);
std::string ServiceStream::muxerCommand;