summaryrefslogtreecommitdiff
path: root/config_default.php
diff options
context:
space:
mode:
authorAlib <aliboba@free.fr>2010-02-27 18:28:55 +0100
committerAlib <aliboba@free.fr>2010-02-27 18:28:55 +0100
commit60bda4c150c981432102022177c3b391043817f3 (patch)
treeaa717a9f5d3d72e0feba7dd5104023f5ae217de9 /config_default.php
parent2429b586aeeb9d7eb7e77bdd932ce76e364bc8c5 (diff)
parenta9e31e70ebf61264b548d7607a9621972eefe3ee (diff)
downloadistreamdev-60bda4c150c981432102022177c3b391043817f3.tar.gz
istreamdev-60bda4c150c981432102022177c3b391043817f3.tar.bz2
Merge branch 'master' of projects.vdr-developer.org:istreamdev
Diffstat (limited to 'config_default.php')
-rwxr-xr-xconfig_default.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/config_default.php b/config_default.php
index 3a2dba0..3733e12 100755
--- a/config_default.php
+++ b/config_default.php
@@ -25,6 +25,7 @@
$quality=array ( 'Edge' => '128k 64k 1 240x160',
'3g' => '350k 64k 1 408x272',
'Wifi' => '512k 128k 2 480x320');
+ $maxencodingprocesses=10; // Max simultaneous encoding processes
// Misc
$ffmpegpath = '/usr/bin/ffmpeg'; //path to ffmpeg binary