diff options
| author | TheTroll <trolldev@gmail.com> | 2010-03-23 19:36:24 +0100 |
|---|---|---|
| committer | TheTroll <trolldev@gmail.com> | 2010-03-23 19:36:24 +0100 |
| commit | 85b5a9f4c49db6dbbe282e9e8ab60fbc074d6a52 (patch) | |
| tree | 2140027c1fe137bb139f78d1d4f2715143a31922 /config_default.php | |
| parent | 7d8bc8ba0454d704bb7be03909a31d0c01a4be1a (diff) | |
| parent | c32c1785108597b3bb500ea7f85d2c63cef00359 (diff) | |
| download | istreamdev-85b5a9f4c49db6dbbe282e9e8ab60fbc074d6a52.tar.gz istreamdev-85b5a9f4c49db6dbbe282e9e8ab60fbc074d6a52.tar.bz2 | |
Merge branch 'jquery' of projects.vdr-developer.org:istreamdev into jquery
* 'jquery' of projects.vdr-developer.org:istreamdev:
added auth
removed auth temporarely
added auth
fixed default segmenter install path
removed logos in git
default max encoding to 3 .
corrected bug when returning back to home
Diffstat (limited to 'config_default.php')
| -rwxr-xr-x | config_default.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config_default.php b/config_default.php index 11aa4a1..df1926f 100755 --- a/config_default.php +++ b/config_default.php @@ -27,12 +27,12 @@ $quality=array ( 'edge' => '128k 64k 1 240x160', '3g' => '350k 64k 1 408x272', 'wifi' => '512k 128k 2 480x320'); - $maxencodingprocesses=10; // Max simultaneous encoding processes + $maxencodingprocesses=3; // Max simultaneous encoding processes // Misc $ffmpegpath = '/usr/bin/ffmpeg'; //path to ffmpeg binary $segmenterpath = '/usr/bin/segmenter'; //path to segmenter binary // Version - $isdversion = "0.3.7"; + $isdversion = "1.0-alpha1"; ?> |